Merge "Remove obex library code from frameworks/base." into tm-dev