Merge "CDD: Clarify the location where the Security Patch level's      are declared." into nougat-mr1-dev