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

Change-Id: I1bc8741550626747849a13b15e8ec45dbc5d8110