Merge "libcamera_client: Updated Android.bp"