Revert stock Android dependencies to B2G CAF repo