Merge "Delay start of surfaceflinger until after the Runtime APEX is mounted."