Merge "Be even more explicit about changing generated Android.bp files" into main