Merge "system_properties.cpp: special case ro.* properties"
am: ffa54cd7ba

* commit 'ffa54cd7ba3860b00f42aa8410a94a17f5856bea':
  system_properties.cpp: special case ro.* properties