Merge 54432a473bfe53d5a0b852eb7098eda42c3d4ef3 on remote branch

Change-Id: I4301105b2cc7b4aa4e3cc3e327ae16dec21f05a9
tree: 9df88c82f3605fdcacc6fc47b566743dd10dac74
  1. amber/
  2. Android.bp
  3. METADATA