Merge "Apex: increase build timeout"