Merge "Convert libcamera_client to Android.bp" am: f99ffd986c
am: 101c5c2327

Change-Id: I796d8327479e5e88e2491e2ea1c37ec52220384a