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

Change-Id: I8be072e5e406f175710f5102648061073719c344