Merge "Temporarily add set_mmap_rnd_bits brillo exception"
am: 4390837

* commit '4390837bf907ac3a9bbf95570ca75bf448d8087b':
  Temporarily add set_mmap_rnd_bits brillo exception