Merge "Allocate buffers of the right size when BT_HDR is included" into...

Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am: 7645a788 am: 1333ab63 am: 83c7777f am: 2c8a379d  -s ours am: c99b7c80  -s ours am: 584f455e  -s ours am: ea13ef2d  -s ours am: 75264382  -s ours am: af8fd17c  -s ours
am: b3d59d15  -s ours

Change-Id: I2498e8d8fdc4117562adfabba78c1502f2197795