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

Change-Id: I4510a356bb532659af15f42f84b6ebf5d6e5c82c