Differentiate system and test apis in whitelist
am: 370a06477c

Change-Id: I75a4f3f8f25df56edfc1919742692b84fc72fe9c