Merge \"Add host native build of primitives_test\" into nyc-mr1-dev
am: 9f212e587d

Change-Id: I1f854bb703f400e5648c8434a9a35ab7042e409b