Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev