Merge "Exclude libvndksupport from APEXes." am: 0b4f2532a7
am: 1fd25add88

Change-Id: I04124c9aa38de67572c26f914fe7f240704c03af