cleanup & track forked repositories

Change-Id: I494521f9df3cc66a53ed0ace2ca90dca1e81b658