Merge branch 'android'
drwxr-xr-x - driver
drwxr-xr-x - kprobe