Remove multilib suffixes from libraries am: 85059deed7 am: 5fecbdd03a
am: 05448190f1

Change-Id: I9c1548385b7ef3e1bf1733a46d714da71837fc45