Merge "Fix names of jars in smali and baksmali scripts" am: 50deee78da am: 234ef98c04
am: e714eb61a3

Change-Id: I40a1a13836c926c72cbaf4e4498f0afaf3bd281b