Merge "adbd: remove ifdefs guarding root/secure." into rvc-dev