Moved to rosjava_bootstrap version 0.1.22 to support android studio version 0.8.x
Will no longer work with android studio version 0.6.x
Merge branch 'master' into patch-2

Merge tango_serial project.
Merge branch 'master' into patch-2