[ros-diffs] [akhaldi] 61519: [BASESRV] * Remove one time inclusions from the main header and put them back where they belong. * Include what we need from the NDK instead of the whole set. CORE-7716