Merge "Delete jack support"
am: 498e8ed7ce

Change-Id: Iaa36407cc37ad7ca9b22138ff5c1cdfccaea9fbb