Bug 905882 - Update hamachi manifest to 1.2 upstream

Change-Id: I4b75f2ff63e618335dd65192f8bfe7811520058c
Bug 927274 - B2G NFC: Add NFC Daemon for Nexus4

Change-Id: I0c062311316ac553e1ed97def90f26f9661c5f10
Merge pull request #115 from dleeMozilla/master

Bug 927274 - B2G NFC: Add NFC Daemon for Nexus4
Merge pull request #116 from michaelwu/bug905882

Bug 905882 - Update hamachi manifest to 1.2 upstream
Revert "Bug 905882 - Update hamachi manifest to 1.2 upstream"

This reverts commit 954c9e510935455b672a0d151eb99d8e4d22ea25.

The mirror wasn't setup correctly so we'll have to back this out temporarily till that gets fixed.
Revert "Revert "Bug 905882 - Update hamachi manifest to 1.2 upstream""

This reverts commit ba06caccd9d47d76962cade5d9040f4f1fb36a95.

Let's try landing this again.
Revert "Revert "Revert "Bug 905882 - Update hamachi manifest to 1.2 upstream"""

This reverts commit ab951755d6d4bf57c508fde2a7d920bcf3e471a0.

Things are going red again, though I'm not sure if it's my fault this time. Backing out anyway just in case.
use local aosp mirror

Change-Id: I9d43700cff3b1678830adf8c2906748424f17138