Merge "ART: Remove jack from tools" am: b7e784694b
am: 484836964f

Change-Id: I30a0ea81bd07717fd2276dbf7ca258b6ff378791