Merge "Fix Heap buffer overflow in clearkey releaseSecureStops"