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

Change-Id: I3f9d743edc390b9fd1abc772d8a567f729889186