Merge "mkbootimg: add hridya@ to OWNERS."