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

Change-Id: I6c5088ec6b2b7810acf2c3e6835b205f80eded06