Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev
am: 991c240a88

Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf