Refs #100983  Merge remote-tracking branch 'origin/100983-strategy-refactor'
Refs #100983  Merge remote-tracking branch 'origin/100983-strategy-refactor'

* origin/100983-strategy-refactor:
  Refs #100983 Update ccnd Android.mk to make use of android_obj.mk generated by make depend.

(fixes bug introduced in commit f228f626)

svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx