Switched back to some AOSP repos as never got enrc2b support working

Change-Id: I57197dbdbb6d03fa5ef10707a21ccc9123dfaf03