Merge "Add prebuilt_etc for android.hardware.wifi.direct"