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

Change-Id: I07f0810040e2e3e1f41864d8189a839bf0ab8787