Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev am: 349abaf55f am: 5148c19dea
am: c51c65c97c

Change-Id: I674907940c58d9a6ced027b32a076c41c3a1d131