CM12vification

Conflicts:
	Android.mk

Change-Id: I910c471ede3876c7d2fc45e938dbd856f126e992