Some syntactic cleanup am: a16a9df3e3

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

Change-Id: I9e7dce57135cf8ab4ec04db39d6b84651b207c75