Merge cherrypicks of [16381824] into sc-qpr1-release.

Change-Id: If180606978a78099704be56e1e6329a87a716f58
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 4621dd8..f825cfd 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -32,6 +32,7 @@
 #include "aidl_language.h"
 #include "aidl_to_cpp.h"
 #include "aidl_to_java.h"
+#include "aidl_to_ndk.h"
 #include "comments.h"
 #include "logging.h"
 #include "options.h"