Merge \\"liblog: reset pid and uid cache after a vfork()\\" am: d4f6324176
am: 56da612ec4

Change-Id: I9e5968c08274a7b19722b4c3b56a477203c73de7