Merge "Include Android.mk when building S5 am: e8c9b7a632 am: 062224ac6a" into rvc-d1-dev-plus-aosp am: 52b29c509b am: ec05765eb8

Change-Id: I7c1788be33ecbeecc7623c48a30c2b2ed72138ba