Adding calabash-android 0.4.20 patched with fixed for space in aapt command
Resolving merge conflict