Merge "Delete jack support" am: 1704df64ce  -s ours
am: b8fb4e35ba

Change-Id: If710d83dae6ca05a024862b7f176a130aab8a3da