Some syntactic cleanup am: a16a9df3e3 am: a0887bfcb2

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

Change-Id: Id853364299169c6d2b27ddadaa1e770abc958196