Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b
am: 7554be1e36

Change-Id: I4d34ab801e08034c7d54818cc0f313efa88edf69