Lets get rid of the Jelly Bean ADB.

Change-Id: I16e23f02f9952ded8a0a827a77db88be436970b0