Merge "Update Keymaster support lib OWNERS" am: f7238c9c01 am: e65c023c44

Change-Id: I77e313a681028dd8c1e92a8c51f974d478219a23