Merge "Change storage duration to static for native choreographer." am: a1ef6e7
am: 106b00d

* commit '106b00d6ed0c6da972a59fed5cadfd05e92437af':
  Change storage duration to static for native choreographer.

Change-Id: I500f351e08e25286c61f1b87f331899da0e439c9