more changes
Merge branch 'experimental' of github.com:AospPlus/android_device_htc_enrc2b into experimental