Bug 944962 - Building other-licenses/android, skia-npapi, and snappy in unified mode. r=ehsan

--HG--
extra : rebase_source : c521e5acf73f5544f02f3b8ea852b43bfe308f8e
Bug 945077 - Fix -Wunused-variable warning for sHandlersInstalled on OS X. r=luke

--HG--
extra : rebase_source : d2d74e9c4016669e12b00576446f70f476a3b672