Merge pull request #34 from vicamo/bugzilla/959019/avoid-ADDITIONAL_BUILD_PROPERTIES

Bug 959019: avoid ADDITIONAL_BUILD_PROPERTIES. r=mwu
Bug 916863: Added NFC configuration

On the emulator, nfcd and nfc_nci.generic have to be build. Also
the variable TARGET_BOOTLOADER_BOARD_NAME has to be set to the
value 'generic', so that libhal will find this value in the env
property 'ro.product.board' when it loads nfc_nci.generic. And NFC
has to be enabled by setting the ro.moz.nfc.enabled.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug 965542 - Add mksdcard binary back to emulator-jb, r=mwu
Merge pull request #40 from ahal/b2g-4.3_r2.1

Bug 965542 - Add mksdcard binary back to emulator-jb, r=mwu
Add support for bluez on JB
Disable clang
Bug 978888 - add dbus-daemon to support bluez, r=mwu
Merge pull request #42 from viralwang/b2g-4.3_r2.1

add dbus-daemon to support bluez
Bug 944299: enable bluedroid on emulator.