Merge "recovery: Properly detect userdebug or eng builds"