Merge "Add missing libraries, to be able to link on 12.04" into froyo