Merge "Add stubs to libnativewindow.so." am: c46f5e1bd3
am: 53a1d3b0f0

Change-Id: I8475029995feab3c2980e690c96f9a519c7d7673