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