This reverts commit 5585983817. as the new projects now build. Bug: 12080266 Change-Id: Icaf0980b2a1f34d9e0670426faef6bb27aca3555
5585983817