merge -r 1367764:1367765 from branch-2. FIXES: HADOOP-8370

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1367766 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -142,6 +142,10 @@ Release 0.23.3 - UNRELEASED
 
     HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
 
+    HADOOP-8370. Native build failure: javah: class file for 
+    org.apache.hadoop.classification.InterfaceAudience not found  (Trevor
+    Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

hadoop-common-project/hadoop-common/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>