Merge "Remove jack-related modules"
am: effab6ec37

Change-Id: Id871cff2868e01c8e7f47f2dfd4906bfd97ab736