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

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