Merge "Create android-base/format.h that includes fmtlib headers"