Use correct branches of repos for this manifest branch.

Change-Id: I26172f93d46b718ba769ed8476429adf2334f4b6
Track my packages_apps_Settings

Change-Id: If88c4b66951b9c178ac2a40c33f37fcc5c937a07