Sync the manifest project for code review

Change-Id: I51247049538171a4773b872116f4a6a196ca784d
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	default.xml