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

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

Change-Id: Ifb5f13e7a154d2012a9af96fa9f013c094d00b3e