media: Match quality definitions with what the framework expects

These ids are used internally in order to parse the media codecs
quality definitions and pass them along to the frameworks/base component.

These ids must match the ones present in f/b/media/java/android/media/CamcorderProfile.java

If the hardware is a qualcomm, the match if OK. Otherwise though, they are
off-by-one which causes crashes in the camera app when selecting a low
resolution.

Change-Id: Ife21a49314fee687d70f90deb618c6b138601d96
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
libstagefright: Make timed text for audio only files work on start

The basic problem is for an audio-only track adding the subtitle track through
the Android api does not kick off the text driver when you call start

Change-Id: I86d206551fa783c225c1867122148c68ef41404a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'hydra/cm-11.0' into cm-11.0