Merge "overlay: add r970-specific eri overlays" into cm-11.0