Revert "bluedroid: Fix build with gcc 4.8+"

This reverts commit 2430b71b67e715d7c1a661171e58d6f4e4ac8b58.