am 160a22b8: Reconcile with jb-mr2-release - do not merge

* commit '160a22b8fbc2c25cb893e92fcad2db8fc26e24b2':
Include liblog in fs_mgr to fix the build.

A recent change to how libcutils is built requires liblog
to be explicitly included in the link list if it's needed.

Change-Id: I8547f5e65c488c8f6e314ccd4eb96606742272be
am ebbe9807: Include liblog in fs_mgr to fix the build.

* commit 'ebbe9807906dad946659b6e9f849030eaa87731b':
  Include liblog in fs_mgr to fix the build.
am 6673886d: am ebbe9807: Include liblog in fs_mgr to fix the build.

* commit '6673886d4a9166608fa152e2c922fe3b6022273a':
  Include liblog in fs_mgr to fix the build.
Add logic to fixup file contexts after a policy update.

Bug: 8116902
Change-Id: Ifa1785c75a24a9b3cfcb700f22ded7d16a917f79
Fix perms on /data/security

installd and zygote need to be able
to search the directory to access
the policy files.

Change-Id: I0679fd2084d2664dfb5a594f493317eff058415d
Merge "Add logic to fixup file contexts after a policy update."
Add logic to fixup file contexts after a policy update.

Bug: 8116902

(cherry picked from commit 47677a506febfe386d186f8f854d967f165a342f)

Change-Id: I2a50f68a53aee2c94d03d3e5ced1ea36337fde33
am ebcf93e3: Add logic to fixup file contexts after a policy update.

* commit 'ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea':
  Add logic to fixup file contexts after a policy update.
am 7e25fa18: am ebcf93e3: Add logic to fixup file contexts after a policy update.

* commit '7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998':
  Add logic to fixup file contexts after a policy update.
cutils: add a way to disable tracing for a process

This change adds the atrace_set_tracing_enabled call to libcutils.  The call
can be used to disable all tracing (of the atrace variety) for the current
process.  This is to be used to disable tracing in the Zygote process, as there
is no way for Zygote to be notified of changes to the enabled trace tags.

Change-Id: I0b691cc0dcfc65b16e3d17e1db2866a4deb253a7
merge in jb-mr2-release history after reset to jb-mr2-dev
Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev
am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit '2553825797c40b14981b1b24e44475e07b02267f':
  cutils: add a way to disable tracing for a process
am b7b2c71b: am 25538257: Merge "cutils: add a way to disable tracing for a process" into jb-mr2-dev

* commit 'b7b2c71bf8bf685af4c716e78d5c70decab98b54':
  cutils: add a way to disable tracing for a process
merge in jb-mr2-release history after reset to jb-mr2-dev
adb : add missing connection states

Both CS_RECOVERY and CS_SIDELOAD where not being checked by
connection_state_name which resulted in adb get-state returning
unknown when a device is in those modes.

Change-Id: I00716024d6a0bdb68d6e2380c8cd7b5d056bd15f
Signed-off-by: trevd <trevd1234@gmail.com>
Add OUYA VID to known VID list

Add the OUYA VID to the list of known USB VIDs to allow developers with OUYA
consoles to have their device automatically recognized.

Change-Id: I499114d8071747b972c24681fc0771f000ad9f9d
Merge "Add OUYA VID to known VID list"
am ffc5a4a5: Merge "Add OUYA VID to known VID list"

* commit 'ffc5a4a529338c834954e58de2701572eb0752f0':
  Add OUYA VID to known VID list