[automerger skipped] Retry cache flushes on ARMv7 devices
am: aeba572be7 -s ours
am skip reason: change_id I63b56beaac610ea973def0a57118be9a2647da23 with SHA1 aeb0223f14 is in history

Change-Id: I73e7caeac17c74b5e967d9d2ce5690e8042caadc