fixes for the manifest merger requirements brought in by android-studio 0.6
Merge branch 'master' of https://github.com/rosjava/android_remocons