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

Change-Id: Ie1f38c7bff0daf7fd5c0571830af79e88e9b4f1b