Drivers:Input:Keyboard:merged from android-jb-mr1-v2 branch