Merge "Rearrange/modify aosp setup instructions"