Snap for 5280121 from 11e4fc77672939c3656b939dd5a3c502e0180038 to qt-release

Change-Id: I002136f1b00c1cd7549c758296612e329f88e914
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp
index 8b1f17f..1ade696 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/src/Ala.cpp
@@ -13,7 +13,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <Ala.h>
 #include <AlaLib.h>
 #include <IChannel.h>
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp
index 6132889..9aeafc2 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/src/AlaLib.cpp
@@ -16,7 +16,7 @@
 #include "Ala.h"
 #include "AlaLib.h"
 #include <data_types.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <dirent.h>
 
 static INT16 alaHandle;
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp
index 32574fe..dba3971 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/src/JcDnld.cpp
@@ -16,7 +16,7 @@
 #include "JcDnld.h"
 #include "JcopOsDownload.h"
 #include <data_types.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 JcopOsDwnld *jd;
 IChannel_t *channel;
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp b/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp
index 500b8fc..1cfc3cb 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/src/JcopOsDownload.cpp
@@ -13,7 +13,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <semaphore.h>
 #include <AlaLib.h>
 #include <JcopOsDownload.h>