Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for bouncycastle-*-hostdex" am: 18926e6f3f
am: 2c37b4709b

Change-Id: I3f28b952763ab07ed3db24df2c3540860bb486c3