tree f2707eacde5e14089ed912127e91858ce8c8dbfa
parent bc8899c1039576af97225a1fc43989bbc37bcbf1
author Dan Albert <danalbert@google.com> 1459448748 -0700
committer Dan Albert <danalbert@google.com> 1459448847 -0700

Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ..."

Broke the build.

This reverts commit bc8899c1039576af97225a1fc43989bbc37bcbf1, reversing
changes made to 615357b952a10305787b5268878eed48cb0bd8a7.

Change-Id: Ibd36bc1df7f7e20cb054c6a64686f4324f2d818c