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

Change-Id: Idefb56bcfb8073abf44ec48f3f69f60a70be1550