Merge "Split gen_bp_files, make Android.bp idempotent." am: 8d6aeab882 am: d0edac4eea

Original change: https://android-review.googlesource.com/c/platform/development/+/1450076

Change-Id: I8caff0db72733435bf12ac06d201729c3e2f2642