Merge "Unhide Build.SUPPORTED_ABIS and friends."