Merge "Remove SDK Tools from platform builds."