Merge "Make libnativewindow as LL-NDK" am: 0a18aafb3c  -s ours
am: 6dc2572649  -s ours

Change-Id: Ifce7ab62ecee53fc230d4cb3ee4ef584612a05db