Remove multilib suffixes from libraries
am: 85059deed7

Change-Id: I08776fcbe25e56c18644694ee44d8f11bf9d6b6c