am 155cd3c1: Merge changes Ied379f26,I09fb9d56

* commit '155cd3c155004433215147437cdf71844c9efd87':
  Extend recovery and updater to support setting file security contexts.
  Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.