Update base AMIs to handle "expires_in_version"

Histograms.json changed to contain expiry info in bug 742500. This
caused histogram_tools.py to think new histogram definitions were
invalid. Updated AMIs include new histogram_tools.py and have the
fix from bug 956715 manually applied.