Update the entrypoint with the code entrypoint, not the code pointer.
am: d5a9587acd

Change-Id: Ie9ea2a2ce027f76f7d783cbc5bd2c2e802ab2438