Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567
am: 94ddb28a26

Change-Id: I4acf23d85165cc5b2088183bb2ed2220b98fe4c3