Merge "Fix mips build in InitEntryPoints"
am: d7a7c7f3e9

Change-Id: I9de67848af40584fca3af778a0ae92d263b8e191