Merge "Apex: Fixes build paths"