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

* commit '6937a447429022ea4776418fc47dcd81f57709b2':
  load SYSTEM/build.prop into the info_dict