am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets