Merge "Merge aosp/dev cherry-picks (for MIPS ASan) into aosp/master."
am: 4b1a73563f

* commit '4b1a73563f274c67ee3f65ecada97fedccb12e42':
  Merge aosp/dev cherry-picks (for MIPS ASan) into aosp/master.

Change-Id: If89d9d5a58ef867212c6b16ca7ca5dabedcdcb02