Merge "Allow to scan vendor/apex during bootstrapping"