jflte:  Combined to have a unified S4 build

Change-Id: I63183f60211bcc15c4c9f79e099d34da393856d3