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

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

Change-Id: I3aebf4612d38eeeb9366259115a91d58278f7afe