Merge "Add bp for fix_android_mk_prebuilt.py"