Android 7.1.1 release 60
Merge "StagefrightTest: add test for bug 32577290" into security-aosp-nyc-mr1-release