Merge pull request #42 from DougGregor/api-notes-change-types-3_1

[API Notes] Add support for overriding the types of declarations via API notes.