Merge "Remove static vndk dep from vendor modules"