Merge pull request #1 from viralwang/master

enable wifi in Flame
removed lines based on mwu's suggestion
Merge pull request #3 from nhirata/aurora_build_fix

Bug 999058
Bug 1000685 - enable wifi in flame, r=mwu
Merge pull request #4 from viralwang/master

    bug 994577 - add some files for flame to fix below issues. r=mwu
Merge pull request #5 from viralwang/bug1000685

Bug 1000685 - enable wifi in flame
Bug 1001327 - enable NFC in flame nightly build. r=mwu
Merge pull request #8 from viralwang/bug1001327

Bug 1001327 - enable NFC in flame nightly build.
Bug 1006414: Add media_codecs.xml and media_profiles.xml into /system/etc/
Merge pull request #10 from BruceSunMozilla/bug1006414_add_media_codecs_xml_and_media_profiles_xml

Bug 1006414: Add media_codecs.xml and media_profiles.xml into /system/et...
Bug 1007697 - Add librecovery to the system image
Merge pull request #13 from lissyx/bug1007697

Bug 1007697 - Add librecovery to the system image
Bug 1009297 - Add TARGET_USES_ION
Bug 1009377 - [Flame] Use correct libnfc-brcm.conf and libnfc-nxp.conf NFC config file. r=mwu
Merge pull request #15 from sotaroikeda/Bug1009297

Bug 1009297 - Add TARGET_USES_ION
Merge pull request #17 from DimiL/bug_1009377_v2

Bug 1009377 - [Flame] Use correct libnfc-brcm.conf and libnfc-nxp.conf N...
Bug 1010516 - Configure GAIA_DEV_PIXELS_PER_PX
Merge pull request #20 from michaelwu/master

Bug 1010516 - Configure GAIA_DEV_PIXELS_PER_PX on Flame
Bug 1010212 - Copy Flame GPS/libloc blobs to /system/lib r=mwu
Merge pull request #19 from lissyx/bug1010212

Bug 1010212 - Copy Flame GPS/libloc blobs to /system/lib. r=mwu