am d532077a: am d270230f: Merge "sign_target_files_apks: rewrite build.prop...
am d532077a: am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
* commit 'd532077a':
sign_target_files_apks: rewrite build.prop correctly in eng builds