Merge "keystore: add AID_ROOT into the user table."