add android_vendor_aojp,
add SCL22
Merge branch 'test' into cm-11.0