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

Change-Id: I215883636fceef64fd7b4c56a5ab0b9ce61c4414