GitLab

Added missing Android.mk change in this commit.

This reverts commit 1fcabcd3.

Change-Id: I71e7fbc8f80a35b4666af985cffb4e7a2eb5634f