Merge "Code cleanup around compiler options and JIT." am: 853cc56ae6
am: 699f0fc12b

Change-Id: I6f00a9a73fcfb22a60d58d94a93e64dcaeb42dbf