Merge "Add support.multidex tests app for an update bug."