Merge aosp/dev cherry-picks (for MIPS ASan) into aosp/master.

Change-Id: I2648388f5c2cd04e6d27f7ebd9aa43e1411f4b3d
8 files changed