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

Change-Id: I6d963ee080c2eb2eca282e7eee15faf36b0fb394