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

Change-Id: I1cc272a62cc67158dc24c0cbb3564f068ccc7dad