add api 21 qualifiers

 - watch
 - tiny cs fixes
 - tag MIUI related changes
update internal framework to API 21 (lollipop)