Update manifest to my forks

Change-Id: Ic3e5685087dcf1d2845f6c6e26930520ef7ed839