qcom-common: proper eri overlay

Change-Id: Ifd3930a68625497ceb660a3aeba1fab43cbc26eb
Merge branch "cm-11.0" into kylin