Merge "Un-@hide some missed video APIs." into mnc-dev