am 57c5fa1: am f005cd6: AI 148161: CTS: Support from creating derived pl

Merge commit '57c5fa15345fe987c30dae55407b2677f22ec43d'

* commit '57c5fa15345fe987c30dae55407b2677f22ec43d':
  AI 148161: CTS: Support from creating derived plans from previous sessions.
tree: 153c96232185e2d91c7466404f693d5eac71cdbf
  1. tests/
  2. tools/
  3. Android.mk