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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build