Merge "Update naming of platforms subdir" am: 2e55cb4f

Original change: https://android-review.googlesource.com/c/platform/build/+/2259482



Change-Id: Icadacabc6f5b37d9793b081e4e98dbf3c98e4512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>