Merge "Start losing code to libadb."