Merge "Add Android.bp-based definitions for host sdk-repos"