Merge "Create android-base/format.h that includes fmtlib headers" am: 7f34035f08 am: 3b4ec0387b
am: b1411b2b2c

Change-Id: I3a81a489948a09daac97dc11bc93d0aa09c7670d