Merge "Update OWNERS for hardware/libhardware"