ANDROID: Organize local hacks into structured patches by theme am: d80dad4f69 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ltp/+/39618992 Change-Id: I772503340d6c766e777cd9d82bab802b9e15ed12 Signed-off-by: Automerger Merge Worker <[email protected]>