Keep simple, keep most in device repos
Add calibrate-battery script to /system/xbin/calibrate-battery
Update my otacenter.pro build.prop overrides to lollipop