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

Change-Id: I62ea46d564a8d7e3de8a306704c6b667edf0d272