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

Change-Id: Ic26d82cc5957bff397bc8c2465a10ab9036ddf93