Merge "Allow update_engine to kill postinstall process." am: 987014c894 am: adabd898c5
am: 81e48f9724

Change-Id: I0f30763ac163bb5032d296097b346eec10ed2dc2