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

Change-Id: I083c454d2becdf656f022a093cb098ae28417ce8