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
Change-Id: Icef81edd5fec2d5edee0af3c02f4b85ea75a9d0f