am 35aeb6fa: (-s ours) Merge "[DO NOT MERGE] Compile using Jack"

* commit '35aeb6fad868943c579b0ee7dd500698caf679ac':
  [DO NOT MERGE] Compile using Jack