Apply fix for Bug 897611 to galaxy-s2.
Merge pull request #118 from justindarc/master

Apply fix for Bug 897611 to galaxy-s2. r=dhylands
use local aosp mirror

Change-Id: I9d43700cff3b1678830adf8c2906748424f17138