Updated to r201734.  Removed unused declaration from lit test.

Also updating lit test to be more roboust (changing fixed offsets to
flexible offsets)