Remove Music and add back in Email

Change-Id: I4a36b5bb9fe861e907d8aa3f8546415643b48711
Clean up build config

Change-Id: I1ac6752a8c7630ed40e829f5ceb1a828ec23da05