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

Change-Id: I969235970f4a7ed0184760dc20b2dcd0c79ec4b1