change android_packages_apps_Settings repo to aojp

Change-Id: I73bd35f28f6b3e38d9b427b2db4c42aee2d1115f
add remote private for aojp repository
Merge branch 'cm-11.0' of git@github.com:aojp/android.git into cm-11.0

Conflicts:
	default.xml