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

Change-Id: I97a2e56097ca2f4a23ae682afcb86c47d9fd8749