Merge "Docs: Finish clarifying AOSP build instructions"