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

Change-Id: I81c154c63764fa04564342f1b438d706e5759910