add M3 manifest and fix kernel repo for M2 manifest

Change-Id: I0d060049dc380587b41fa7cf7ff5eb9e7bc0f768