Track our own Contacts & MediaProvider

Change-Id: I2723c835963c24506464a21c4621da119eef21d3
Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	default.xml
Merge remote-tracking branch 'PSD/remix-legacy' into legacy-staging