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

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

Change-Id: Id04cbbd4c2b2b7c561fb3642dbb4641469b32ec1