add api 21 qualifiers

 - watch
 - tiny cs fixes
 - tag MIUI related changes
update internal framework to API 21 (lollipop)
Merge branch 'master' of https://github.com/iBotPeaches/Apktool

Conflicts:
	brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
Merge remote-tracking branch 'origin/master'