android-5.0.0_r2 -> android-5.0.0_r6

Change-Id: I3b1ed33ec528cec179eb4e3fd960e302db8bcc5a
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0

Conflicts:
	default.xml

Change-Id: Icf03623331ade993c81c66b4c66572cca1f6ab8a