Merge changes Idc6e518c,Ia1cc0506

* changes:
  Create SdkVersion enum, migrate users to it
  Runtime flags only for fast/slow hiddenapi path