Merge "pdk: add android_common.jar" into klp-volantis-dev