Merge "Cache flush/invalidate needs RWX permission"
am: 4e68ebf9b6

Change-Id: I70cb7467e01ddf3d9027affc77a41c579e863b20