manifest: update to r7 tags

Change-Id: I08633bd426fc6763761f8162134cd78b3d9dbcec