Merge "Fix zygote energy-aware scheduler tuning bug"