Commit 1
Latest Changes: 2 modules in Android, a few debugs in NDNLP