Merge "NdkWrapper: add missing DRM AMediaFormat keys"