Bug 895086 - Remove unused find_from_uniqueID() function from SkFontHost_linux r=mattwoodrow
Bug 895635 - Make RES_DRAWABLE parallel to other RES_* in mobile/android/base/Makefile.in. r=blassey
Merge s-c to m-i.