Merge "Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am: 0716c8e6 -s ours am: c71be69f -s ours" into oc-mr1-dev-plus-aosp