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

Change-Id: I130d4c518160d7d30353b8ca8c62339440b9ac6d