Merge changes I1f7b0181,I1ee616a3 into tm-qpr-dev

* changes:
  New lint detector for Context.getSystemService()
  Move API lint stubs to common class