Merge "Enable compat checking & lint for system_services api" am: b14743ce82 am: 34aaecf48c

Change-Id: I173a1cc900f4537a15cad9ab79c7b8ae72a0f258