Fix resource IDs being added to the android namespace

Using @+android:id/some_id will create a new resource ID
with package ID 0x01 rather than 0x7f, for non framework
packages, if "some_id" does not already exist.

Change-Id: I86d57ae6ac88e7dae8420a92e4d55b6c935fd188

Conflicts:
	res/layout/preference_streamvolume.xml
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy