am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed...
am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit 'cb6fbc89':
Report a runtime error instead of asserting on malformed avc configuration data.