extract_headers_to hardware_legacy \
+    hardware/libhardware_legacy/include/hardware_legacy/wifi.h \
     hardware/libhardware_legacy/include/hardware_legacy/vibrator.h \
     hardware/libhardware_legacy/include/hardware_legacy/audio_policy_conf.h

@@ -201,27 +200,25 @@ extract_headers_to log \
 extract_headers_to system \
     system/core/include/system

 extract_headers_to android \
     system/core/include/android

+extract_headers_to system \
+    system/media/audio/include/system

-check_header_exists bionic/libc/kernel/uapi/linux/sync.h && \
+check_header_exists bionic/libc/kernel && \
     extract_headers_to linux \
         bionic/libc/kernel/uapi/linux/sync.h \
         bionic/libc/kernel/uapi/linux/sw_sync.h

+check_header_exists bionic/libc/include/android && \
+    extract_headers_to android \
+        bionic/libc/include/android
+
+check_header_exists bionic/libc/private && \
+    extract_headers_to private \
+        bionic/libc/private
+