Merge "libutils: RefBase remove 'basetype' typedefs" am: 6b924d5a97
am: bb15e25719

Change-Id: I63f67d1a5a869e87d9040fdd2d954390b0ed3bc2