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

Change-Id: I872ef7bc003ad41f81d96443ae946369fac3477c