Merge "Remove static vndk dep from vendor modules"
am: cb2598e485

Change-Id: I83d753b13ae5cf271f69603da88a5a325359becf