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

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