Fix build

Change-Id: I4b9b218a9a390d4169426903aa6bdd6fe5a2df1e
Merge branch '4.4.2' of https://github.com/Velocity-Project/frameworks_rs into HEAD

Conflicts:
	Android.mk
	cpu_ref/Android.mk

Change-Id: I3760d6ba42f4b407a481ce95d10eb55c095e2672