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

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

Change-Id: I99243afde9d0588383d5820ce6916f6b1337c5f6