Merge "Remove obsolete Android.bp file" into mainline-prod