Microsoft, Samsung expand Android partnership