android-5.0.0_r2 -> android-5.0.0_r6

Change-Id: I3b1ed33ec528cec179eb4e3fd960e302db8bcc5a
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android into cm-12.0