Merge "ANT: Support of legacy and new ANT stack" into btcommon.lnx.6.0