am: 435fd175

Change-Id: I0ec4ce41f6c950eee4d87902d6778c5d30da0487

am: 2b31e597

Change-Id: Ie0d3b73bfd883655b487c3c41234734a1ce317ee

am: 864b9af9

Change-Id: I16ff6b9780287001b5db43c6f3c85023592e7a7e

am: b287decf

Change-Id: I350b309626cfcc6d77d3d4a9f37c3a4a4142493c

am: 2f6e66ff

Change-Id: I07deaf9045d9d7038e36e2b674130ad2a6469002

am: 9e61f56d

Change-Id: Ia0c640063aacfd77419c0f4752e8c605b96124ca

am: bd2e729c

Change-Id: I3ec7360adf7e13eb1d0b174ed9fc5eab6d44e3c0

am: 65c3654b

Change-Id: I9bfc27bf2c0391d7d65740a6108cedaeb0be63f3

am: 5bb3c603

Change-Id: I7b2f66d4f8dc0416c7565f719c45329d321e7303

* changes:
  nonplat_property_contexts: use fc_sort vs sort
  plat_property_contexts: use fc_sort vs sort

Test: adb bugreport
Bug: 63629306
Change-Id: I7a366b199ddd0ec303dc25ca8c35764c5d7e3af8

Bug: 65570851
Test: boot sailfish
Change-Id: I008bf5386595c614236de44131afcda7d3fd6d98
Merged-In: I008bf5386595c614236de44131afcda7d3fd6d98
(cherry picked from commit 82ca9c2e)

(This reverts internal commit: 82ca9c2e)
Test: None.

Change-Id: I48bbbe197c8e793bd9888b6ef4dadb2b3466423b
(cherry picked from commit 852aca05)

Bug: 37916906
Test: Builds 'n' boots.
Change-Id: Ia1d86264446ebecc1ca79f32f11354921bc77668
Merged-In: I208ec6a864127a059fb389417a9c6b259d7474cb

am: 69fa3434  -s ours

Change-Id: Icade667a3c76acd5d32b3d3b871337da61093b0f

am: ed144eba  -s ours

Change-Id: I09a7304634d826728133ba6a18e1859a4401074d

am: 7d1130f1  -s ours

Change-Id: I37cd37e3e4215fecb3aeb1957507f52b3d3e5448

(This reverts internal commit: 82ca9c2e)
Test: None.

Merged-in: I97ffdd48b64ef5c35267387079204512a093a356
Change-Id: I97ffdd48b64ef5c35267387079204512a093a356

am: 4c0933a1

Change-Id: I44aa4737c2fe5293f11370863169aeb21c120dbf

am: 58983a3e

Change-Id: I89cdfa3148ff7ec2dd51d3103f9840b5eacd7f81

am: c975bd90

Change-Id: I576189108f7863076070734b958385d1cd545c5b

am: 6b1597df

Change-Id: I91559d7b85962d9a728ac0862a338b5eb544be1f

am: 0808ea3a

Change-Id: I389b99a2032e33c3ac2d9dd4a2f4034caf76f220

am: 852aca05

Change-Id: I7897c5211de238b497fabd1fa89da3c4fb38909c

am: 3e21c5f1

Change-Id: I970e7ef889ce0ad8376a1fd98fa92c2f5eb8b613

am: 8c8994f5

Change-Id: I5327bcea18feabc38427948fcfa0e505846629e4

Used to display kernel version in settings app.

avc: denied { read } for name="version" dev="proc"
scontext=u:r:system_app:s0 tcontext=u:object_r:proc_version:s0
tclass=file permissive=0

Bug: 66985744
Test: kernel version now displayed in settings app.
Change-Id: I53f92f63362b900347fd393a40d70ccf5d220d30

(This reverts internal commit: 82ca9c2e)
Test: None.

Change-Id: I97ffdd48b64ef5c35267387079204512a093a356

sort respects locale settings, so the value of LC_ALL can affect
how sort orders things. This can cause labeling issues.

More information on locale and sort can be found via:
  * locale(1) - man 1 locale
  * sort(1) - man 1 sort
  * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539



Rather than deal with this locale setting use fc_sort on
property contexts. This also has the side-effect of
stripping comments, and thus sed can be dropped.

Test: This was tested by:
  * comparing outputs to previous runs
  * compile tested *only*.

Change-Id: I1e1eb4dff76f717b5f82f697e677a108abb69892
Signed-off-by: William Roberts <william.c.roberts@intel.com>

sort respects locale settings, so the value of LC_ALL can affect
how sort orders things. Issues have surfaced when CTS build
servers locale differs from image build server locale. And thus
the prologue of property_contexts differs with what CTS was
expecting.

More information on locale and sort can be found via:
  * locale(1) - man 1 locale
  * sort(1) - man 1 sort
  * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539



Rather than deal with this locale setting use fc_sort on
property contexts. This also has the side-effect of
stripping comments, and thus sed can be dropped.

Test: This was tested by:
  * comparing outputs to previous runs
  * booting the x86-64 emulator

Change-Id: I144ef549cc11d9c61849ffc0e1b1b000f1b8d1a8
Signed-off-by: William Roberts <william.c.roberts@intel.com>

This CL was accidentally reverted a second time by commit:
cb5129f9.  Submit it for the third,
and final, time.

(cherry-pick of 5637587d
which was in AOSP and internal master but not stage-aosp-master)

Bug: 62102757
Test: Builds and boots.
Change-Id: I0394907e808c737422e644aec452baa3e777cf6f

am: 8c06c171  -s ours

Change-Id: Ia6c5fa13e253c41fb42ab0034977695baea34406

am: 2aa045f1

Change-Id: Id94738ab2036d39a7eefbf0679d68f1790437883

Also add missing commit: ca595e11

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2a210c3b58565a40117bf3d061e9bf904ed687c2

am: f8e09172

Change-Id: I225f40d2ae0fb451634911677a78bf96df73bb54