This reverts commit 27cf4ad88f. Ironically, this change (to fix the build in gingerbread) ended up breaking the (previously-green) build in master. It probably should have been marked to not merge. Either way, this fixes the master build
27cf4ad88f
Change-Id: I848bf50dc7c928e53a3637c4cec51ebcaef4f47f
Change-Id: I9aa6c8995da39f332b724fabe67ed5efe584552f