Make the aosp repo more reliable

Change-Id: I8f5efe32b2b9938e2995d3cc5ee85d2d93307ee1