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

Change-Id: I1eb82bf76bfef80bbb51e636d166e55a30b234bf