Merge "Test and fix bug checking status of secondary multidex files." into mnc-dev