Adding in more fixes for running AOSP