Add 6 S4s to AndroidProducts.mk... woops

Change-Id: I67d5515576733ddb9d54a41e099900c770cbbab5