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

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