Merge "Removing submodules for apex & distribution"