Merge "Move crt sources out of API specific directories."
am: 0438022a33

Change-Id: Iac9cb58dffd41d5852e055aae0ee612458c75926