tree c216fbac90ec6b400d631899dcb3ccfa8ff7f77c
parent 9906b4bd3c9ea55baf1c5a648c37ab8fa6ecacdd
parent 3f4e5c4563068f277141f5fb3d96ec02afc7ac95
author Yabin Cui <yabinc@google.com> 1587427024 -0700
committer Yabin Cui <yabinc@google.com> 1587427037 -0700

Merge commit '3f4e5c4563068f277141f5fb3d96ec02afc7ac95' into master

Current code contains a compile error after compiler update.
So merge from upstream to fix it.

Bug: 149839606
Test: checkbuild.
Change-Id: I8711e506e36898f1f74f186325b505de11eb2c54