Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 7:
    - creation of empty classes.

Change-Id: I5d93330d6304937bf8f31f685046d1041549603a

Conflicts:
	src/java/com/android/internal/telephony/gsm/GSMPhone.java