[automerger skipped] Merge "Remove obsolete subdirs and optional_subdirs" am:...
[automerger skipped] Merge "Remove obsolete subdirs and optional_subdirs" am: 2b548456 am: 6467a114 am: c66f7e8a -s ours
am skip reason: Change-Id Ifcf47e99d22b1546780968d1030f835173612a27 with SHA-1 305fb2fc is in history
Change-Id: Idae5c032124228811364239240264898594e66bd