Merge "Update Android.bp to match Android.mk"
am: 6ab4609

* commit '6ab460936e7ffb913a72016403c97bfaf0e9df90':
  Update Android.bp to match Android.mk