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

Change-Id: I5e761bb08c72ed2700cec752caba5a6b02b02015