Revert "Update Android.mk"

This reverts commit 168c2adb3e646342be1cdae9f93450ce5dfbfba0.
Revert "mods from vanir"

This reverts commit 8a63c5a624f01db724a3d161f67493e09cdd9153.
Revert "mods from vanir"

This reverts commit 87e7963792a6fbb7403079d1f09469edd3e34059.
Revert "mods from vanir"

This reverts commit 91a9c8d03f19a33f12517a27206bc9340a9502f0.
Revert "mods from vanir"

This reverts commit d9d069aa01a2c55c9287f3c3d60bed4c8ee47627.
Revert "mods from vanir"

This reverts commit 29b3779ad5d26c20fc23b74e0aa202f804957fd1.
Revert "mods from vanir"

This reverts commit 61353511355519f5a902a4b4c0eb20f3d0d9ba01.
Revert "mods from vanir"

This reverts commit 1ff5196b3a3b9866868eda8a79ab744b72009414.
Revert "mods from vanir"

This reverts commit b216ac2d443d2766a8920eb33ab5c01afded4211.