Android.mk file updated for ticket #11986 cherry-picks.
am: 9e9419ecc6

* commit '9e9419ecc6b0d537728b9cc3f678e38f3d49e114':
  Android.mk file updated for ticket #11986 cherry-picks.