Move core/java/com/android/internal/widget/multiwaveview to framework2.jar

Change-Id: I6eb15aebdb9cef6b9e7b43b40873914ce5523654

Conflicts:

	Android.mk