Merge "Revert "Use libnativewindow for platform variant of android_nati..."" am: 76b01b133c

Change-Id: If7af4d9f02490c0ad4a5d6a76d31051e6b329445