Merge "MediaDrm#mNativeContext is a long, not int."