Merge "Use proper platform version checks (apigen)" into rvc-dev am: 0bb978de88

Change-Id: Ia263b8106a099ec5420ad05bd2eb2b14674b771b