Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"