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