No more android_ for m7-common

Change-Id: I67415d08ccc8faaa43d6c00f34ce978bc07c99fa