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

Change-Id: I4b304450f820e3185400ed614a282bb9d2aad599