Merge "Fix AMediaExtractor_getSampleCryptoInfo returning iv as key." into nyc-mr1-dev
am: 57d8e70186

Change-Id: Iff5bf7a4678cd1b9fe498f2e3210948aa4ea29e4