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

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

Change-Id: Id61b10b29404454123b967131b92e4814c04a8ad