Merge "Revert "Revert "Use libnativewindow for platform variant of andr...""