Move vendor-ndk and system-sdk to system_ext manifest am: bb842a65ed am: a1cf4efd6c

Change-Id: Ib593f63d646c13c726617b777874d9152ddde427