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

Change-Id: I6639b9afacc0abfc208ff7ac98043268918c54a7