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

Change-Id: I4ec0d60b5c608413fffe142fad3f6e5abbe4dc69