Merge "Adding jbires to keymint/aidl/OWNERS"