Merge "Separate diffing from Android.bp generation." into main