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

Change-Id: I3fe6ded124d9c7520508896420d97813bbcef14d