Merge "Update SDK build for recently-added support library modules"