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

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

Change-Id: I879899577255c12bba71e2cd02ad10a2b64783ef