Import Jack and Jill Douarn 1.3-b2 for SDK
am: e4f5dc836d  -s ours

* commit 'e4f5dc836dd74ec4aa6910e18225be980e5ac75f':
  Import Jack and Jill Douarn 1.3-b2 for SDK

Change-Id: I88a9b4d85e59dd9b0a213c6921a5e0e20085c2f9