am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."

* commit 'bf115d33f26949b636d8cac79d253448fbca2388':
  sdk: Ensure we copy build.prop to platform image directory.