Merge "Add some extra zygote preloads" into oc-mr1-dev
am: 15998c4d01

Change-Id: I9164d6c8816c9cfaabe85b0e33c7eed76682e1fd