Merge "Optimize out extra jar copies" am: 678c77d9af
am: cad1043266

Change-Id: I626c59deaa2bae027707be1bef199f4d07434254