Fix for failures due to null trees

Previous fix was inadvertently removed due to a rebase issue.

BUG=aomedia:463

Change-Id: I607737ee64c35e679b19d3df97bb1b4ee47de268
1 file changed