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

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

Change-Id: Ie5ecba83d5c10ca600811468087850c374c46388