Merge "Update Android.bp"
am: 138a11c8a1

* commit '138a11c8a1687c72098ac9ceedfdf857426748cf':
  Update Android.bp