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