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

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

Change-Id: I2a8f2c2442445800f9a397b4b099ff799d558adb