Merge "build: fix builds when first_api_level isn't defined as property" into oc-mr1-dev