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