diff --git a/.travis.yml b/.travis.yml
index 5a010983..af349f86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,6 @@ script:
   - test "$(grep -H compileSdkVersion */app/build.gradle | tee /dev/stderr | cut -d= -f 2 | sort | uniq | wc -l)" = "1"
   - test "$(grep -H targetSdkVersion */app/build.gradle | tee /dev/stderr | cut -d= -f 2 | sort | uniq | wc -l)" = "1"
   - test "$(grep -H buildToolsVersion */app/build.gradle | tee /dev/stderr | cut -d= -f 2 | sort | uniq | wc -l)" = "1"
-  - grep "\t" */app/src/main/AndroidManifest.xml | cat -t && false
-  - grep -E "\s+$" */app/src/main/AndroidManifest.xml | cat -e && false
\ No newline at end of file
+  - 'grep -n "\t" */app/src/main/AndroidManifest.xml | cat -t && false'
+  - 'grep -n -E "\s+$" */app/src/main/AndroidManifest.xml | cat -e && false'
+  
\ No newline at end of file
diff --git a/audio-echo/app/src/main/AndroidManifest.xml b/audio-echo/app/src/main/AndroidManifest.xml
index f456ca7b..19ce4c9f 100644
--- a/audio-echo/app/src/main/AndroidManifest.xml
+++ b/audio-echo/app/src/main/AndroidManifest.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.sample.echo" >
-
     <uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <!-- debug-writing file need external storage writing -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>  
-  
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
         android:allowBackup="false"
         android:fullBackupContent="false"
diff --git a/hello-thirdparty/app/src/main/AndroidManifest.xml b/hello-thirdparty/app/src/main/AndroidManifest.xml
index 9dcf3f23..95f90644 100644
--- a/hello-thirdparty/app/src/main/AndroidManifest.xml
+++ b/hello-thirdparty/app/src/main/AndroidManifest.xml
@@ -9,14 +9,12 @@
       android:allowBackup="false"
       android:fullBackupContent="false"
       android:hasCode="false"
-      android:icon="@mipmap/ic_launcher"      
+      android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name">
-
     <meta-data android:name="com.google.android.gms.games.APP_ID"
                android:value="@string/app_id" />
     <meta-data android:name="com.google.android.gms.version"
                android:value="@integer/google_play_services_version"/>
-
     <!-- Our activity is the built-in NativeActivity framework class.
          This will take care of integrating with our NDK code. -->
     <activity android:name="android.app.NativeActivity"
@@ -31,6 +29,5 @@
       </intent-filter>
     </activity>
   </application>
-
 </manifest>
 <!-- END_INCLUDE(manifest) -->
diff --git a/native-media/app/src/main/AndroidManifest.xml b/native-media/app/src/main/AndroidManifest.xml
index 0079c787..68f6ccb7 100644
--- a/native-media/app/src/main/AndroidManifest.xml
+++ b/native-media/app/src/main/AndroidManifest.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.example.nativemedia">
-
+          package="com.example.nativemedia">
   <uses-feature android:glEsVersion="0x00020000" />
-
   <!-- INTERNET is needed to use a URI-based media player, depending on the URI -->
   <uses-permission android:name="android.permission.INTERNET"></uses-permission>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
-
   <application android:allowBackup="false"
                android:fullBackupContent="false"
                android:icon="@mipmap/ic_launcher"
@@ -20,5 +17,4 @@
       </intent-filter>
     </activity>
   </application>
-
 </manifest>
diff --git a/native-plasma/app/src/main/AndroidManifest.xml b/native-plasma/app/src/main/AndroidManifest.xml
index 231d6052..4f59330b 100644
--- a/native-plasma/app/src/main/AndroidManifest.xml
+++ b/native-plasma/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.example.native_plasma"
-	  android:versionCode="1"
-	  android:versionName="1.0">
+          package="com.example.native_plasma"
+          android:versionCode="1"
+          android:versionName="1.0">
   <application
       android:allowBackup="false"
       android:fullBackupContent="false"
diff --git a/san-angeles/app/src/main/AndroidManifest.xml b/san-angeles/app/src/main/AndroidManifest.xml
index 372d74f4..750da3bb 100644
--- a/san-angeles/app/src/main/AndroidManifest.xml
+++ b/san-angeles/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.example.SanAngeles"
-	  android:versionCode="1"
-	  android:versionName="1.0">
+          package="com.example.SanAngeles"
+          android:versionCode="1"
+          android:versionName="1.0">
   <application
       android:allowBackup="false"
       android:fullBackupContent="false"