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

Change-Id: Ia97204dbf4aeaa97d08601aab6bd761cd5cfcea3