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

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

Change-Id: If8217f7dcc5657884ae9a4e33d80ddd801a890ea