Merge "Build 64-bit cameraservice on 64-bit-only" am: 3291861f5d am: c0005b3820

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

Change-Id: I903f2dc6db919c0c5bc301a3967a4f8c404c2771