Merge "Remove libandroid.so from media namespace."