fixed build and code refactor to keep miui code in same branch for both jb4.1 and 4.2