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

Change-Id: I052f9be64bdc131c7e0bcbcdc94e98f21f2e1371