Merge "Delete jack support" am: 0e82eea2d4  -s ours am: 2f2ea24780
am: cbf5e23369

Change-Id: I46b8e5915e1b34345f6aa636d4a70062edc0457e