Merge "stagefright: encode number of android.generic temporal layers" into nyc-mr1-dev