Merge "Pipe disabled compat changes to runtime through zygote." am: f33c3a8c9d am: c06f69d2b4

Change-Id: I189518f7abee2013a57c8b76c69e02145ef4238a