Merge "Add libbase to otatools"