Merge remote-tracking branch 'tance/terminal-support' into cm-11.0

Conflicts:
	Superuser/jni/su/daemon.c

Change-Id: I2739f6bcbed03636d7a2fb66377977cd16999926

Author: koush

Superuser/jni/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := su
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_STATIC_LIBRARIES := sqlite3 libcutils libc
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/sqlite3
-LOCAL_SRC_FILES := su/su.c su/activity.c su/db.c su/utils.c su/daemon.c
+LOCAL_SRC_FILES := su/su.c su/activity.c su/db.c su/utils.c su/daemon.c su/pts.c
 include $(BUILD_EXECUTABLE)