- remove the inclusion of format_constants.h - use incremental update of pointer, instead of arithmetic (follow-up to e2affacc35f1df6cc3b1a9fa0ceff5ce2d0cce83) Change-Id: I48420c8defc8d47339f54bc00e9da9617f08ab32