Merge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev
am: a2639d47ee

Change-Id: I6b34107fb6de6b4bc183a4485458248b5e10a259