Merge "Add Rtt support to sl4a." into lmp-dev