Merge "Move system_properties over to C++."