Merge "Make test 1935 avoid entering jit code before test thread starts" am: 9276ec72a2
am: 8cbb797014

Change-Id: Iffcb311b2f98abdfd1cbfbd7f665a56e2b2ef628