android-5.0.0_r6 -> android-5.0.0_r7

Change-Id: I1277d9a20101bed3200fafee530c8662291455f8
Launcher3 -> Trebuchet

Change-Id: I3b77b7d0e5289b567c6a1dfe7cd14f1d4372e487
Merge remote-tracking branch 'cyanogen/cm-12.0' into cm-12.0