Revert "bluedroid: Fix build with gcc 4.8+"

This reverts commit eb2604ae57b41edb168e680def6efc4388bff236.