Merge changes from topic "may27-sdk" into sc-dev

* changes:
  Finalize resource IDs; script to help in future.
  platform/frameworks/base/ - S is now 31