Fix Helpers.java
rename CMDProcessor to CMDProcessor2
Merge remote-tracking branch 'upstream/kitkat' into kitkat