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

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