Merge "fix_android_mk_prebuilt: Add --in-place option" am: 463a91b819 am: 043da1c03d am: e809d32d7a

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

Change-Id: Ib046aa9a76d41a7a50c8822c83d1e8b7cca43b1d