galaxy s4:  Setup a unified build

Change-Id: I9f705c7da681d8e7bb7e9575d4c3c73bd4d3c09d