Update system.prop (reverse-merged from commit e2ebd01ed5fbcfbf1afd3fd39edc7e8f15881a21)