Merge "Android.bp: Update to match make builds" am: 030085f53d
am: 273b50e4e5

* commit '273b50e4e57b2c3ce1c334f8ffda71cbc94e26e7':
  Android.bp: Update to match make builds

Change-Id: Iebcdade7b12ff7f58fc82fe84c5bbbd3514dac8f