Merge "Remove unneeded dependency from libstagefright.so"