Merge "[incremental] fix x86 native lib extraction"