am d34c722c: Merge changes Iac33dbaa,I18fcd37d into mnc-dev

* commit 'd34c722c59b13c80f89cfdeaf45ff38a3a12a6c5':
  pass in correct buffer to print_id
  stop including rootdir build.prop