Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query"