Snap for 8389696 from 2e2799dd657d16d4456be0674c21784be9114141 to tm-d2-release

Change-Id: Ibd100a927246343fb2bfd73b7f7df920d9a6dcd1
tree: 8f2b54283f43289bbe48f008ff179686ddc9b2ed
  1. apex/
  2. Android.bp
  3. OWNERS