Merge branch 'master' into pdlive_samsung

# Conflicts:
#	config.gradle
#	live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java

lib_google/src/main/java/com/shayu/lib_google/utils/GoogleBillingManage.java

@@ -199,10 +199,6 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
         }
     }
 
-    public boolean getGoogleService() {
-        int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext);
-        return code == 0;
-    }
 
     int resultCode = -1;
     String resultToken = "";