Merge "Build libsimplejni using SDK" am: 86c0968a05 am: bebb47b683
am: fd41a528f4

Change-Id: Id621990d8b02fe279806fc4f1c794f567b7c83ff