am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev

* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
  Fix memory leak in ResTable