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

Change-Id: Ie5c3ef04e2e8bdca148a56b79cb670889b434e25