Merge "Merge "Provide a script to update the generated Android.bp" am: 92c1be2a08" into main-16k