Merge "remove lib/os_brick"