Merge "permissions.cpp: remove is_selinux_enabled calls" am: ac28b58488
am: 2511c1ac20

Change-Id: I8cd793c540fcb92e869349133c7918a0e4f4c44f
tree: 03850526155567dfdcc6affc39ab29f4d2d54510
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE