Snap for 7161250 from 86f2c711e43c14c868ace01c5dbe44184e146053 to sc-release

Change-Id: I6069337e5f903c5b4c027ec573d87575386fe8e3
tree: 88c16a33397cc2cf42fbdcd19f952a303e6939f6
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml