Merge changes Iac33dbaa,I18fcd37d into mnc-dev

* changes:
  pass in correct buffer to print_id
  stop including rootdir build.prop