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

* commit '030085f53df7d74b861b12de792596406ff667f3':
  Android.bp: Update to match make builds

Change-Id: I9cb883c5bdea61d3b2c4d9d1800a7c2cb6cf66e4