Merge "ANativeWindow_fromSurface: Use acquire not incStrong" into sc-dev