Merge "Fix 64-bit build issues" am: 5533d0cd4f am: 9c78c5c239 am: 3fe7cd59db am: d62dbc58fa

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

Change-Id: I9f0c59f2f14d52676e7ede7ed48e8f893b500976