Merge "Revert "Revert "Use libnativewindow for platform variant of andr..."" am: 9678488a7e

Change-Id: I15a8762dc958cb02257ae2100c4ce21c7766d573