Snap for 7189849 from 2017bf43d01c5a1d88e1b0fa4a18ecd321e47633 to sc-v2-release

Change-Id: Ifb9b092678ca50e5b2ba168a45f1257aefbbcb9e
tree: 07f4920c25d463814a09efb4590e20773b6ff2b9
  1. tools/
  2. Android.bp
  3. METADATA