Merge "Clean up METADATA and license information in Android.bp files" into main