[Cleanup] Remove a couple of type="int" attributes that snuck in.

[Cleanup] Remove a couple of type="int" attributes that snuck in.

This attribute was deprecated in https://codereview.chromium.org/2941623002

Also, run "git cl format" to clean up histograms.xml a bit.

BUG=735364
TEST=presubmit
R=holte@chromium.org

[Ilya Sherman, 2017-06-21 19:48:49]

The CQ bit was checked by isherman@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-06-21 19:49:16]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Steven Holte, 2017-06-21 19:52:08]

lgtm

[Ilya Sherman, 2017-06-21 19:53:02]

The CQ bit was unchecked by isherman@chromium.org

[Ilya Sherman, 2017-06-21 19:53:05]

The CQ bit was checked by isherman@chromium.org

[commit-bot: I haz the power, 2017-06-21 19:53:23]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 22:29:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 22:29:17]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)