Merge "base: delete abi compatibility shims." am: 64979d3726

Change-Id: I39dbc644e5039949a0f22bcd8a9179f541d45ed4