Merge "Add post fork hook for System Server" am: f2a342b3ab
am: a58c2a07c1

Change-Id: I15b3a4ee67b4f78a6903315358f8349f3bd4aa4a