Merge "Add sdcard and logcat permissions support for RIDL/LogKit II"