Merge branch 'dev' into plt_branch
drwxr-xr-x - dalvik_handlers
drwxr-xr-x - driver
drwxr-xr-x - kprobe