Merge "Update Android.bp via update-makefiles.sh" into pi-dev
am: e6da8cb609

Change-Id: Icad1f34c2fa180a30cf207d915cf0bbfcdb6a1d6