Merge "Update to renamed ANativeWindow methods"