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

Change-Id: I31ebf2e42643b4c8d59f9116fe0aca35bfe7a8af