Remove RPSSample dependancy on v4 support library