Merge "Add @hide to the keymaster interfaces"