Cleanup
Don't enable ADB authentication on eng builds by chirayudesai