Snap for 7110675 from 4359a1eda9c4d3965c5e53e4c88147a3c7e2ad0e to sdk-release

Change-Id: I6cfb72c153928439224c6d7f1f351e1f0f894b79
tree: c45e98e7f8b8888658a589b1ac4e808862e2cf8a
  1. Android.bp
  2. api/
  3. java/