Merge "add legacy-android-test java library to PDK platform.zip" into oc-mr1-dev