Branch reconciliation for camera changes

Test: local build
Change-Id: Ia1271359c7a0ec5a88644aaf1a5f664c27017a7c
1 file changed
tree: ec945c041b9d2f44edb068ec187b07e3a71ebdc0
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk