Merge "Revert "Flush icache using rw to r transition"" am: 9579b53489 am: 993c4a533b
am: cbeb0e0d23

Change-Id: I5d23282ad71337e00e6c07c885dd185a53bcf4ac