Merge changes I0aa46d9d,I6431111b

* changes:
  Add __INTRODUCED_IN_{32,64}.
  Add __INTRODUCED_IN hack to complex test.