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

Change-Id: I31bbb79fc86cc67a22674955c0cae97d35bb323d