Update for CM 10.1 base and Apktool 2.0