Merge tag 'android-5.0.0_r0.6' into cm-12.0

Android 5.0.0 Release 0.6

Change-Id: I8db7d0f1d9cf73caee3d36423a79405b969429af