Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	libs/hwui/OpenGLRenderer.cpp

Change-Id: I4dd4136ca47ff19d314ccebc69bc7df4727b6443