Merge "Updates and fixes to android.net.lowpan"