Remove unecessary overlay and Update t-mobile s4 dependencies

Change-Id: I531a89a83292020ec16832b61c8886be095bd57a