Merge "Pull in upstream crypto/ and sandbox/ dirs at r334380."