Merge "adbd: remove ifdefs guarding root/secure."