Cleanup and disable sendbug

Change-Id: I33530ff3b6369033ad056e85a60ed8b8e4a69b1b
ODex enable

Change-Id: I27a1d167d8c58b1f89b369b43f1e642c3d487fbf