Merge "Move libartd-simulator dependency to host-only" am: 170de15c5f
am: 652abe9f1f

Change-Id: I363da487bd4df42350ec8cc8976c667908ecedac