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

Change-Id: Iaa8627caea940e178c5c155c7f8af85aa1b6da03