project external/bluetooth/bluez/
diff --git a/tools/Android.mk b/tools/Android.mk
index 619ff1c..16de42f 100755
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -218,6 +218,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libbluetooth libbluetoothd

 LOCAL_MODULE:=bccmd
+LOCAL_MODULE_TAGS := optional

 include $(BUILD_EXECUTABLE)
 endif

project external/fsck_msdos/
diff --git a/Android.mk b/Android.mk
index bafd757..b801d1b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifneq ($(BOARD_USES_CUSTOM_FSCK_MSDOS),true)
+
 LOCAL_PATH := $(call my-dir)

 include $(CLEAR_VARS)
@@ -13,3 +15,5 @@ LOCAL_MODULE_TAGS :=
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc

 include $(BUILD_EXECUTABLE)
+
+endif

project hardware/qcom/display/
diff --git a/liboverlay/overlayLib.cpp b/liboverlay/overlayLib.cpp
index 6d65c9d..c9aecff 100755
--- a/liboverlay/overlayLib.cpp
+++ b/liboverlay/overlayLib.cpp
@@ -728,11 +728,11 @@ bool Overlay::setFd(int fd, int channel) {
 bool Overlay::queueBuffer(uint32_t offset, int channel) {
     return objOvDataChannel[channel].queueBuffer(offset);
 }
-
+#if 0
 bool Overlay::waitForHdmiVsync(int channel) {
     return objOvDataChannel[channel].waitForHdmiVsync();
 }
-
+#endif
 bool Overlay::queueBuffer(buffer_handle_t buffer) {
     private_handle_t const* hnd = reinterpret_cast
                                    <private_handle_t const*>(buffer);
@@ -761,11 +761,13 @@ bool Overlay::queueBuffer(buffer_handle_t buffer) {
                     return false;
                 }
             }
+#if 0
             //Wait for HDMI done..
             if(!waitForHdmiVsync(VG1_PIPE)) {
                 LOGE("%s: waitforHdmiVsync failed", __FUNCTION__);
                 return false;
             }
+#endif
             break;
         default:
             LOGE("%s:Unknown state %d", __FUNCTION__, mState);
@@ -1506,11 +1508,11 @@ bool OverlayDataChannel::mapRotatorMemory(int num_buffers, bool uiChannel, int r
     mPmemFD = data.fd;
     mPmemAddr = data.base;
     mBufferType = data.allocType;
-
+#if 0
     // Set this flag if source memory is fb
     if(uiChannel)
         mRotData.src.flags |= MDP_MEMORY_ID_TYPE_FB;
-
+#endif
     mOvDataRot.data.memory_id = mPmemFD;
     mRotData.dst.memory_id = mPmemFD;
     mRotData.dst.offset = 0;
@@ -1639,7 +1641,7 @@ bool OverlayDataChannel::queue(uint32_t offset) {

     return true;
 }
-
+#if 0
 bool OverlayDataChannel::waitForHdmiVsync() {
     if (!isChannelUP()) {
         reportError("waitForHdmiVsync: channel not up");
@@ -1651,7 +1653,7 @@ bool OverlayDataChannel::waitForHdmiVsync() {
     }
     return true;
 }
-
+#endif
 bool OverlayDataChannel::getCropS3D(overlay_rect *inRect, int channel, int format,
                                     overlay_rect *rect) {
     // for the 3D usecase extract channels from a frame