Merge 0f53262e6c950895c1b9de99c9f2e408005cbaef on remote branch

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