Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev am: 4bc839e267
am: fc945bf674

Change-Id: Idde7f1b8382468723bbb7678e1d10f9ead3cbe1e