On 64bit host, sizeof pointer is not equal to sizeof int. Need for host tools. Change-Id: I848ceb878b873e6764a077e8a4ee31e756f30017
git cherry-pick --no-commit 73cfba122a4ae1c6162fe1c5112e77d8c8430dd9 Change-Id: Id0c6188ece19f6eade18ba8725384d94465aa197