am 1cc5b151: am bccc75a7: Merge "stop including rootdir build.prop"

* commit '1cc5b1513101797076dbd0f9fbb027da17479cfc':
  stop including rootdir build.prop