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