Merge "Allow -Xjitsaveprofilinginfo for system server" am: 8682fce263
am: 1d9fa389bc

Change-Id: Ia213186c3c432f07cacbad4b1bf0a143ad46cbe1