am 18cb0198: am 6937a447: Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev

* commit '18cb0198efe5fa245765becfd310f801ab7faa39':
  load SYSTEM/build.prop into the info_dict