am 546e6205: (-s ours) am ea6de994: (-s ours) Merge "[DO NOT MERGE] Add...
am 546e6205: (-s ours) am ea6de994: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
* commit '546e6205':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack