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

Change-Id: I164fcf55f99af26581621ae3adc48b93e3cd95af