Merge "Adding TEST_MAPPING to system/security/keystore"