Merge cherrypicks of ['android-review.googlesource.com/3750870'] into llvm-r536225-release. Change-Id: Ia0605d018e8d9f90a319c60cb44226f92c78aeb2