Merge "Remove setting LOCAL_MULTILIB from AUDIOSERVER_MULTILIB" am: 5c536200d6 am: b594a1b33c

Change-Id: Id335da90a0212008813d7723fa7711e53a3d47c6