Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
tree: 0d9a14fbfd313da6817a5de908fc7b8ba8227de7
  1. data/
  2. java/
  3. jni/