Merge "Add bp for fix_android_mk_prebuilt.py" am: 6a79143797 am: 4ca7b535dc

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

Change-Id: Iea339a728ea97ebcaf1d9afc4317be9ddcad41f4