Merge "build: fix builds when first_api_level isn't defined as property" into oc-mr1-dev am: 25268c1093
am: 6a17c27b71

Change-Id: Iaa698bde26fbbf9d31ae26617889558223a31820