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

Change-Id: Id6dc5359c93d76b948ab8843e6877e0ba3b23127