Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev