Merge "add # vndk tags to vndk-only symbols of libnativewindow"