Merge "Fix memory leak from retrieval of getSupportedDrmInfo."