Merge "Ensure that apis are unhidden even if there is no vdex"