Merge "Revert format change related CLs" am: b96da7539c am: 0ad970a68e am: ca82e5706b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1498215

Change-Id: I57abe41c4b1b4594a7fdc8b2d237166ec25f097c