Merge \"Increase the memory limit of media.extractor to 20%.\" into nyc-dev
am: af54d1a6f9

Change-Id: I9f7aacdd376e5c54eb318d680e6ae3f8a7717808