Merge "Use module_lib stub from com.android.media apex"