Include Android.mk when building S5 am: e8c9b7a632

Change-Id: Ieb24bc7be1ad27743da74c4ed17bc5d53b26795d