This reverts commit bcd592053a. Bug: 36206160 Test: Fugu compiles, didn't before the revert Change-Id: Id80fd4ce9db3fce03b049cf81f938187c7ddb8b0
bcd592053a