Merge tag 'android-5.0.0_r2' into cm-12.0

Android 5.0.0 release 2

Change-Id: I6870f438003f87c12c87c2683575724aef188e56
grouper: Remove config_deviceHardwareKeys

Not supported anymore/currently.

Change-Id: I696b6d05b28fdc1ca9c207957bc6a6c18647f576