Merge "Remove bionic-unit-tests-scudo."