Merge "Have zygote mount appcompat system properties" into main