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

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

Change-Id: I99014db206bdbbb9819833658c0f5c6b045ba2b9