fixed inconsistant defines that are supposed to match tagtechnology.java

Change-Id: If3afc9a3d46fe3780261d029caac18d242718e38
merge changes from remotes/github/cm-10.1 into master