Merge "Adding TEST_MAPPING to frameworks/base/keystore"