Merge "[HWUI] Minor ANativeWindow usage cleanup"