Rollback bad merge of 1421347 but leave in Justin's updates to the metadata from 1429395.

git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/branches/develop@1430322 13f79535-47bb-0310-9956-ffa450edef68