Merge "Fixes for API Review: android.speech.tts" into mnc-dev