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

Change-Id: I0793b130cbed2483bd3fe3c047f393558d59361c