Follow renames of conscrypt and bouncycastle to remove -host suffix

Test: m checkbuild
Change-Id: I72bd7249cf6bdc4a2251f6877c776f439649da81
2 files changed