Update the entrypoint with the code entrypoint, not the code pointer. am: d5a9587acd am: 099fe54576 am: 1a2e2d60af
am: cc1ecca45d

Change-Id: Ia311f17cf7f05b1c74e976bbf7536c359a4fc27d