Merge "Allow vendor code to link to libandroid_net."