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

Change-Id: Icffa6d3e9b8b9736dd4af80ad2e360c02e41ddc5