Merge "Make sure ANATIVEWINDOW_QUERY_BUFFER_AGE is identified as VNDK API."