Merge remote-tracking branch 'aosp/lollipop-release' into cm-12.0

Conflicts:
	audio_policy.conf
	device.mk
	fstab.manta
	overlay/packages/apps/Settings/res/values/bools.xml
	self-extractors/samsung/staging/proprietary/Android.mk

Change-Id: I4eface96b44792695da530de885623e7485f4c45
Disable non-present overlays

Change-Id: I253f89c107031b305b4f7ce21c564bc0107d3171
Update fingerprint to LRX21P

Change-Id: I308ee467ee4ed4a992090bd225745944e972d2d5
Merge remote-tracking branch 'cm/cm-12.0' into HEAD