This is another pass of migration of includes for users of histogram
macros. This doesn't fully complete the migration, but gets us closer
to the end result.

A few files needed to include both headers as they use both
macros and the raw API.

BUG=416479
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
TBR=jam@chromium.org

Review-Url: https://codereview.chromium.org/2293583002
Cr-Commit-Position: refs/heads/master@{#415067}