Merge "msm: cache_erp: Support logging ERP events to system memory" into msm-3.0