Merge \\\"stagefright: do not use default bitrates in MPEG4Writer\\\" into...
Merge \\\"stagefright: do not use default bitrates in MPEG4Writer\\\" into nyc-dev am: eb6dbc64 am: 1d92e720
am: 2174352a
Change-Id: I12ca26050546c399d6f9493309923da017840806