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

Change-Id: I1d498fa1fac847e676841a80a23b7b0b0fac7f0e