Merge "add ueventd to shutdown critial process" am: 7fe28d9d9a
am: aa3c4e9def

Change-Id: I0165a3db66d06e9b0314fda3b02171024d63b060