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

Change-Id: I61e449d41c1829d1e0ed996eadeee6096461480d