Pull hmdb from upstream.
Update Android.mk for hmdb.
Rename main file for c++.
Re-reference hmdb.