Include Android.mk when building S5 am: e8c9b7a632 am: 282a64a1d7

Change-Id: I07e568ee969e500a8c1f33540a85073ec7e70a1a