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

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