Few fixes
Merge branch 'caf' of github.com:h2o64/android_device_motorola_falcon into caf