android: support building with SDK tools 24

Change-Id: I424e81b849d7e0ec5c61eddcc70279e3559885d1