Merge changes from current upstream master branch.

Merge changes from current upstream master branch.

This should be done as a proper git merge, but our infrastructure doesn't
allow such "exotic" git usage as maintaining upstream branch...

Please note: accesses_apply() function includes merge of upstream changes
and not yet upstreamed code relying on /smack/change-rule.
That code will be sent upstream once the relevant interface show up in kernel
(v3.10).

Change-Id: Ieac4e0fad82621d6fb24f531385d965c045532fe