Merge "ART: Remove jack from test" am: bb7cd233a5
am: 8823af9867

Change-Id: I0e4f42dd225349e23ca0bf2c16e1251fdcd1b371