android-5.0.0_r2 -> android-5.0.0_r6

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

Conflicts:
	default.xml

Change-Id: I65b516bc3aa6b3e846bec4beda08887718294ae5