am 1b41a7a9: am 2aa67439: Merge "Fix ClonedSecureRandomTest on single core devices" into jb-dev

* commit '1b41a7a99ed278630ae93ff83f77199fdca0a4a5':
  Fix ClonedSecureRandomTest on single core devices