Snap for 6209820 from a4609eb813264071a2539a40dd1472304f48e9b5 to r-keystone-qcom-release

Change-Id: I81e443bcd4ce61acb72a878fd36e40462c16086a
diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk
index 249111a..e898824 100644
--- a/amber/camera/libhdrplusclient/Android.mk
+++ b/amber/camera/libhdrplusclient/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_SHARED_LIBRARIES := liblog
 
 # For AOSP builds, use dummy implementation.
-ifeq ($(wildcard vendor/google_easel),)
+ifeq ($(wildcard vendor/google_paintbox),)
     LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=1
 else
 ifneq ($(TARGET_EASEL_VARIANT), amber)