am d8d99c45: Merge "Handle policy reloads within ueventd rather than restarting it."

* commit 'd8d99c45b704399d50ae0a5e4df938d825c70cfa':
  Handle policy reloads within ueventd rather than restarting it.
resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp

Change-Id: I08e9898940f7cdd466469b76760807cc5d5c67e4
Merge "Add support for socket security context specification."
am a8ba1f2f: Merge "Add support for socket security context specification."

* commit 'a8ba1f2f0b67063978819cc7d04276060450f364':
  Add support for socket security context specification.
am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification."

* commit '0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5':
  Add support for socket security context specification.
Trigger a policy reload from post-fs-data.

Once userdata is available and decrypted, trigger a policy reload to pick
up any policy update files stored under /data/security.

Change-Id: Ic2b3121c3395429b108c40d1d7f5a3124a5896c5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
[GNSS] Add AID_GPS to property user white list

Add "gps." and "persist.gps." to property_perms white list.

Change-Id: I7177170676d774c87e08d1548f5264ac27cba3ff
Orig-Change-Id: I7a94caa26be4aefd2fe4f155908e2f8f09858bee
Signed-off-by: Nicolas SUET <nicolas.suet@intel.com>
Signed-off-by: jerome Pantaloni <jeromex.pantaloni@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 118091
libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created

On some devices there is a slight delay between the creation of "/dev/bus"
and "/dev/bus/usb". Previously, the code assumed that both are created in the
same time which caused "watch_existing_subdirs" to fail and libusbhost to stop
working until the device is rebooted. The fix will setup an inotify event on the
creation of the "bus/usb" so it will not be missed once it's created.

Change-Id: I17f06dd167e61573307425e48898e12ebc954093
am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev

* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
  Add standard options to readlink
am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev

* commit '7e18e45617b73c7a4081202115bb8e5a06ebb1c7':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created"
am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created"

* commit 'db71324a4f3538fa8716ec4d77b3a512598c0527':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created"

* commit 'f0eec1301dc629bfbaf71f1d2db8be0449d7ec97':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
Merge "Fix build with gcc-4.8 and array boundaries issue"
am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
  Fix build with gcc-4.8 and array boundaries issue
am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

* commit 'bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c':
  Fix build with gcc-4.8 and array boundaries issue
correct msi usb vendor id.

Change-Id: I13128531b8dd7758abddce47ce1c119381773c26
Merge "correct msi usb vendor id."
am a7f6e015: Merge "correct msi usb vendor id."

* commit 'a7f6e015a5cf2ac85549fe676d6641caf6af1291':
  correct msi usb vendor id.
am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."

* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
  correct msi usb vendor id.