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

* commit 'd270230fa49311901d8797a9e77865c37857d028':
  sign_target_files_apks: rewrite build.prop correctly in eng builds