Merge "overlay: remove eri.xml" into cm-11.0