Snap for 6179498 from 068aa473eab7cc0521c1b01668fdadb98b5e11f1 to rvc-release

Change-Id: I495491534a36bf7b7c235f1e84258118f0dc8a99
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)