Merge "Revert "Remove unused project."" am: fc7cda06f5

Change-Id: I1dbd864aa8ee9e2a44b6acc173c12740abf9447f