Android 7.1.1 release 2
Merge "Decoder: Fixes in handling errors in Mbaff clips." into mnc-dev am: 23d5bc6405 am: 1e36eb1b99 am: 48c4de0f98 am: eab553f817 am: a38d1442ee
am: 6d169c47a9

Change-Id: If44d0734bc304e73f2dd8495d29bb4bcda5e53a9