Android S V2 Beta 3
Merge "Update to improved system_properties API."