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

Change-Id: Ibe5ef8000c4c3ac00da1efe74730cdc46cdbf587