Bug 915482 (part 4) - Minimize vm/Shape-inl.h includes.  r=terrence.

--HG--
extra : rebase_source : 973eb6668f38be4261ab3eef0b3645473bd3ebc2