Merge "Redo DtmfLocalTonePlayer" am: f9592be953 am: 5faa4d15a0
am: 936fd6208f

Change-Id: I5f9f51a46b9ac3ab9d9afedcb84957b541b1fce4