Merge "Make ANativeWindow available over stable AIDL"