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

Change-Id: I6970f7162686d5119c184e7ed4cba58448e6de7d