Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: d037324f2f am: 869b7d8bf9
am: 5677ac75ea  -s ours

Change-Id: Icbbbf7f48331b45e3e07c480305af887c203ddd8