Merge "Deoptimize zygote compiled methods in DeoptimizeBootImage." am: fe2886de2a
am: 46c8029316

Change-Id: Ie0cca9232181080add5b7566aa991ad5631b49e1