android: samsung hardware branch return

Change-Id: I16a456af337c242c4b6da8d6e821fca6247f6fb5