Fix build for GB 2.3.3
Update Console test app for ICS.
Update console test app to be compatible with JB 4.2.2