Merge "Remove static linking of libstagefright and libmedia_helper from libmedia2_jni"