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

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