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

Change-Id: Ib263bb9e4ecc987edc1de86c97ceff20f3119862