Merge "Remove unnecessary dynamic dependency on libbase." am: 0b4d4826a6
am: 3b1cac15b2

Change-Id: Icc1d5af3d02f75caa1b5d3dbc6d8c29d4373fec9