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

Change-Id: I8f396b1b14cd0e5b4b5a436473c42b046ecfa527