Merge changes I446fb6ab,Ife3bbd29 into oc-dev

* changes:
  Valid resource IDs may be negative
  AAPT2: Workaround for findViewById with package ID > 0x7f