Merge commit '502f6a06a50ed58d01b7ad3d2dcb19ae7d614684' of sso://googleplex-android/platform/external/scudo into HEAD
Change-Id: I59bc0391d61799c78da3f29c6bcc44c8d3a14026