Revert "Enable preliminary subtypes for F-release"

Bug 17743363: Preliminary subtypes should be removed from F-release

This reverts commit 45c917e23852861d144eba085304ad5a2e665e98.

Change-Id: I5e91a7fd0efdc16e140a91fab6300bd8ba9cd6c7
10 files changed