am bc109d0f: Merge remote-tracking branch \'aosp/upstream-master\' into mymerge

* commit 'bc109d0f85157802822d0364b495dfb355fcd3d1':
  Update libsepol ChangeLog.
  libsepol: Binary modules do not support ioctl rules.
  Update checkpolicy ChangeLog.
  dispol: Extend to display operations.
  Update libsemanage ChangeLog
  libsemanage: do not copy contexts in semanage_migrate_store
  Update libsepol and checkpolicy ChangeLogs.
  Add support for ioctl command whitelisting
  Move ChangeLog entry to the correct project
  Update libselinux ChangeLog
  libselinux: selinux.py - use os.walk() instead of os.path.walk()