Snap for 4519870 from a08a6a4202e546361a9334f803de7427a87de9c7 to pi-release

Change-Id: I6a4d9af9dabf9f3be7cccb6ffb005c3478ea8857
diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk
index 18db0ac..249111a 100644
--- a/amber/camera/libhdrplusclient/Android.mk
+++ b/amber/camera/libhdrplusclient/Android.mk
@@ -29,9 +29,13 @@
 ifeq ($(wildcard vendor/google_easel),)
     LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=1
 else
+ifneq ($(TARGET_EASEL_VARIANT), amber)
+    LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=1
+else
     LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=0
     LOCAL_SHARED_LIBRARIES += libhdrplusclientimpl
 endif
+endif
 
 LOCAL_HEADER_LIBRARIES := \
     libsystem_headers \