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

Change-Id: Ic0b42eb505d2c5601db94179aa5bd815775accb5