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

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