Merge "Clear apex.go entries for bluetooth libs" into tm-dev