Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev
am: 9e87e29dc8

Change-Id: Ic3e3de9179d9ed33cebfa67e22865b3d548b837f