Merge "Update Android.bp with recent *.mk changes"