Merge changes I5d17fc87,If1cc6b9a

* changes:
  Cgroup APIs are guarded
  Remove __ANDROID_API__ guards