Merge "Remove jack-related modules" am: effab6ec37 am: 7cd996f927
am: 74337207bd

Change-Id: I1e9ba9086344873dd845355fd11fbabf79565f9f