Merge "Add phony target dist_libraries" into froyo