am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"

* commit 'f8cb672f121495e4f80b96a14140180f71e770fe':
  Frameworks/base: Pass variant and feature-set to runtime