Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/rs into cm-10.2

Android 4.3 Release 3.1
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	cpp/Android.mk
	cpu_ref/rsCpuIntrinsic3DLUT.cpp
	cpu_ref/rsCpuIntrinsicInlines.h

Change-Id: I4c1c51f5289618d6fc6221bf48e280aa90715008