Merge "Build icache for arm on arm64" am: cb0112fe64 am: 04c00f843e
am: 72e4bb0217

Change-Id: I367f9d4586ed83d4c8d01ef906a267f24026ae13