Merge "bluedroid: Fix build with gcc 4.8"