Merge "Fix missing dependencies in master-art-host"
am: 3b7ce4ecc6

Change-Id: Ibaabf9d457cf694f954ef31497fe1b9bbfd81208