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

Change-Id: I461d1fa84aec8bb6f9b63c71ed2258320f334ae7