Merge commit 'eef62b63889329c342be6a595143761a000a1241' into HEAD

Change-Id: I9a60d9c34b283c1514dff0b20993b45c19ff2d9c
diff --git a/src/Android.mk b/src/Android.mk
index caa041b..628bd19 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -22,6 +22,8 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+ifeq ($(ENABLE_IMG_GRAPHICS),true)
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -179,3 +181,5 @@
 LOCAL_MODULE := pvr_drv_video
 
 include $(BUILD_SHARED_LIBRARY)
+
+endif # ($(ENABLE_IMG_GRAPHICS),true)