No more android_ for m7-common

Change-Id: I67415d08ccc8faaa43d6c00f34ce978bc07c99fa
remove the rest of android_

Change-Id: I1def5d19d29124d2ee1e3f83e51d89c2b6608585