Merge "ANativeWindow: add more connectable APIs"