Observations of Gamma-ray Bursts with ASTRO-H and Fermi