Merge "Revert format change related CLs" am: b96da7539c

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

Change-Id: Ic23a311d2577a9b65c60a3f1c407a5c375449e1d