fix header includes for generic types (NDK) am: 14004ed555

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1462942

Change-Id: I2d398a1f8865664394b0ee75da640e51fcfa8949