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

Change-Id: Ibe51ae0dc36dcc091357e950620456b20cd5fddc