Merge "ART: Simplify cache flush calls"
am: 20f6b3c6ca

Change-Id: I265612ed3982cb9ea71461c3f08d36f441ff41be