[automerger skipped] Merge "Add stubs to libnativewindow.so." am: c46f5e1bd3 am: 53a1d3b0f0
am: 9b780cc967 -s ours
am skip reason: change_id I3eef0b9cde4dd5c8dc5955d6ca37079cd6cf706b with SHA1 7864fbc2b8 is in history

Change-Id: I3d9d2d85a56057747d1c5d6eff99e419d8c2a3f3