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