Merge "Clarifications of AOSP build instructions based on personal experience setting up. Also, correction of a wrongly constructed sentence."