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

Change-Id: I7a8adb1598eaea43a7a7d600bf6dd4334d197211