Merge "Revert "Add a baseline flag to JIT compile."" am: 829c33a43f
am: 956ab61f03

Change-Id: I12346ca015ba1f9decf97f6346b894e05843852d