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

Change-Id: I08899b7e7d6f800cb028948b4da0f096832c958b