Clean up some unnecessary system_properties cruft.

Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb