Bug 1107747 - Create build for device branch 2.1s. r=hwine