OK
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	gen/android/content/pm/IPackageStatsObserver.java
	libs/armeabi/libnettrafficstats.so
	obj/local/armeabi/libnettrafficstats.so
	obj/local/armeabi/objs-debug/nettrafficstats/android_net_TrafficStats.o