Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e
am: fd94c15a5a

Change-Id: I635b78d48c94608adb9a1ef784bf5884f64610a3