Merge changes I90edbe5c,I500cc37f

* changes:
  Switch mediaswcodec to 64 bit
  Remove compile_multilib:32 from libmedia_codecserviceregistrant