Merge "Restore $(SOONG_OUT_DIR)/ndk/% in static_whitelist_patterns"