Merge "Move RemoteViewsTest to the right package"