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

Change-Id: Idac5385600f54d80294220ce9571b3cd0d12e46d