Revert "mods for using aosp build repo"

This reverts commit 306fbdfe70d3312f82732175f4d6808d7a4269dd.

Wrong branch :)