Merge "Remove Auxiliary stubs and bootclasspath fragment" into tm-dev