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

Change-Id: I0c2131d0cc07ee539897d9f449af38dcb1c8b644