gralloc: Use default interfaces of allocator/mapper

Use default interfaces until BOARD_VNDK_VERSION is enabled

Change-Id: I3192c912ca790174f6fc6acb37988d6720167b07
diff --git a/gralloc/QtiMapper.cpp b/gralloc/QtiMapper.cpp
index ec07ce0..8de28f5 100644
--- a/gralloc/QtiMapper.cpp
+++ b/gralloc/QtiMapper.cpp
@@ -207,6 +207,7 @@
   return Void();
 }
 
+#ifdef ENABLE_QTI_MAPPER_EXTENSION
 Return<void> QtiMapper::getMapSecureBufferFlag(void *buffer, getMapSecureBufferFlag_cb hidl_cb) {
   auto err = Error::BAD_BUFFER;
   auto hnd = static_cast<private_handle_t *>(buffer);
@@ -323,6 +324,7 @@
   }
   return err;
 }
+#endif
 
 // Methods from ::android::hidl::base::V1_0::IBase follow.
 
@@ -334,10 +336,6 @@
   return static_cast<IMapper *>(mapper);
 }
 
-IQtiMapper *HIDL_FETCH_IQtiMapper(const char * /* name */) {
-  ALOGD_IF(DEBUG, "Fetching QtiMapper");
-  return new QtiMapper();
-}
 }  // namespace implementation
 }  // namespace V1_0
 }  // namespace mapper