remove mpi refs.

Change-Id: If5b401af11fbeafb32bc0c5ba39f6d2e6dbe2cfb
Merge "remove mpi refs."