Merge "Add Bouncy Castle to classpath in run-libcore-tests."