Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev