Merge "Update Android.bp to match Android.mk"
am: a2a1af6d88

* commit 'a2a1af6d88e870e104a7d899a158ec241f07e71c':
  Update Android.bp to match Android.mk

Change-Id: If520b74034c08ffca8bafae523a5194952c06c6c