msm7x25-common: system.prop isn't loaded in common repo, merge changes