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

* commit 'bccc75a7c8c758372a847f3062b06dd6b328a63f':
  stop including rootdir build.prop