* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (511 commits) Conflicts: security/selinux/avc.c Change-Id: Id935c56dde9491e60a2127deb70a46838fa22b40
* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (511 commits) Conflicts: security/selinux/avc.c Change-Id: Id935c56dde9491e60a2127deb70a46838fa22b40