am a536d01c: Merge "Fix certimport.sh to check for Bouncy Castle provider installation (and add 1.6 JDK to PATH)"

Merge commit 'a536d01c1c0119322d655a9ec35665a36abbed6d' into dalvik-dev

* commit 'a536d01c1c0119322d655a9ec35665a36abbed6d':
  Fix certimport.sh to check for Bouncy Castle provider installation (and add 1.6 JDK to PATH)