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

Change-Id: I43bc52a7deeb8889cdd9c5e5b560a261215d0244