Merge "Update smali/baksmali command syntax for v2.2.0"