Merge "Add new profile saver options: save without jit & profile AOT code" am: 6af9869de8
am: 876557ca93

Change-Id: I60409e8f3fad5594590f212bd07efbbcb96b908b