DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I0a31d2578a1cf8fdee902176bf25d9fa0342d74a
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)