[automerger skipped] Merge "Add new classes to jarjar file" am: 5d52366e am:...
[automerger skipped] Merge "Add new classes to jarjar file" am: 5d52366e am: b2a53de5 am: a24a4d35 -s ours
am skip reason: Change-Id I1ca05a575e89daedd3425b6a8ee15842143c2af8 with SHA-1 fb89aa08 is in history
Change-Id: Ic779c5622705399f5f68ba85450148e18a2fcd3f