Merge "Add assets to API level 22 to android.host.theme." into lmp-mr1-dev