Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb