Refactor Core Plaform API checking
am: 01ecfa1c31

Change-Id: I9152ed10e687c0c8abbb5d144d599f47737f9265