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

Change-Id: Ie95237af25a18cd0d56493722aad07aa787457ae