SHOW_OR_CREATE to original behavior, new FastTrack API.

We had been overriding SHOW_OR_CREATE for awhile, but as
part of http://b/2087222 we added a separate API for
triggering FastTrack.  This change returns SHOW_OR_CREATE to
its original behavior, and adds support for the new API.
6 files changed