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