Merge "Android.bp: Update to match make builds"