Fix sysprop_test and add TEST_MAPPING am: 2d915f4f5b am: 78d12346e6
am: 5cc2f114a1

Change-Id: Ief2ce7147511a0fc286531830553917aa911bcf3