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

Change-Id: Ia24cb7496a856a653c4e61c2bd46adc7b17090a7