Merge "Fix preinstalled path of APEX"