Separate the dependencies in the gyp file and use conditional inclusion. Modified behavior tests to work for 64 bit. BUG= Review-Url: https://codereview.chromium.org/2998593002