Fix tag paths

Change-Id: I23f641cc134bcb3a38a0b9cb75a4508b72685c74
Add manifest for 10.1-M2

Change-Id: I942910fc0484aa55eb52ab337856b316721edcc6