Fix various issues...

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Reset back to 1.0
Merge branch 'kitkat-legacy-staging' of github.com:AOSPAL/android_vendor_psd into kitkat-legacy-staging