Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661 am: 70b0e94f80 am: 97caf43fbc
am: 32d5160e23

Change-Id: I4550e06c8a4585f6ee5486a109c7b43ba6ce3194