Merge "Preserve x18 while preloading SP-HALs in the zygote." am: 23fd045842
am: e03a81cce8

Change-Id: I577e0964abbf758234af6f80dcc69a55ee57d736