Merge "Fix use-after-free in AMediaExtractor_getSampleCryptoInfo" into tm-dev