Merge "Fix link-type warnings on espresso-* prebult libs"