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

Change-Id: I6f7fe7a39adb628b456fd4f3f8c85790673e03b5