Backing out changeset 1ff04cca465b (bug 956266) due to compilation failures on Android.