Android.mk file updated for ticket #11986 cherry-picks.

Change-Id: I75313ac229fd65af39d9494aa30a745fd84bb40f
1 file changed