Merge "Clean up multidex build for SDK"