tree 5e14378c06f32d33d76d2a1032f8c5ab46100c00
parent 0b3e1a788cb585c7831c1d449fede5ba9cf334d6
author Stephen Hines <srhines@google.com> 1463536828 -0700
committer Stephen Hines <srhines@google.com> 1463536828 -0700

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

Change-Id: I2648388f5c2cd04e6d27f7ebd9aa43e1411f4b3d