use own manifests, normalize on master branch

Change-Id: I748d4acb7898e9002c1579f2a688afddb1854349