Merge "Update multidex dist task to build and zip maven repository instead of just aar."