Commit 52322ac broke compilation with LLVM 3.1. Change-Id: Ia0e1d91258e6be799cfbd3b6e9693894a6bc5650
52322ac