Add apq8084 to build barrier

Change-Id: Ic7b0ea7ae77c08f075c0af464ef37cbf26d03ccf
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	Android.mk

Change-Id: I307c711eacfac0ed421ec1baa5667eae78d64fb0