[automerger skipped] Merge "Remove setting LOCAL_MULTILIB from AUDIOSERVER_MULTILIB" am: 5c536200d6 am: b594a1b33c am: f1ecd8fc03 -s ours
am skip reason: Change-Id I263b6b302f7220e4b712924d2df2fd2548af03b1 with SHA-1 00c50ac8dc is in history

Change-Id: If76d72a49b6702d0c53a8d497b10bda2c92f52d9