Merge "Temporarily add set_mmap_rnd_bits brillo exception" am: 4390837
am: 08fea59

* commit '08fea59d90f7cebd458acf4f973f7716099a88a8':
  Temporarily add set_mmap_rnd_bits brillo exception