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

Change-Id: Ia120f630a179c27aa4096dbd1d76a654da7d3348