Merge "Remove libbase's trivial libutils-headers dependency."
am: 337b4dd661

Change-Id: I929930dbe7e013d8be608b06c76b5af33b527351