Merge "Use q launch defaults for dcla for com.android.media and com.android.media.swcodec."