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

Change-Id: I409033437e873b9892a7319164c4ae18174ad0f3