Merge "Update smali/baksmali command syntax for v2.2.0"
am: 9e8797d1c9

Change-Id: Iba69e0d31d07676189f0c41fa85a69842d69260e