Include Android.mk when building S5 am: e8c9b7a632 am: 062224ac6a am: 123bb4f54a

Change-Id: I7bfa2a182effe82bdc8faea96b6969dd7bb4cdce