Merge \"Merge \\\"stagefright: do not use default bitrates in MPEG4Writer\\\"...
Merge \"Merge \\\"stagefright: do not use default bitrates in MPEG4Writer\\\" into nyc-dev am: eb6dbc64 am: 24a93b47\" into nyc-mr1-dev-plus-aosp
am: 748e14e5
Change-Id: I8fefeb650bdd66968014e1172836cce8dc1dc4d6