Merge "Remove libandroid.so from media namespace." into qt-dev