Merge "Disable bouncycastle-testdex in the PDK"
am: 5cca7c9729

Change-Id: I6112835ed278494558b0ade98909a7ad66af37c5