Snap for 8323531 from 2e2799dd657d16d4456be0674c21784be9114141 to tm-release

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