Merge "Delete jack support" am: b039cf792f  -s ours am: df0e3a3663
am: 0a9245c78f

Change-Id: I403965cbde7bd776dff4050bfb68b2f32f725294