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

Change-Id: I0a2059ab73a7b6315cae3cc4307f75d925faa511