Merge "Convert frameworks/native to Result::ok()" am: 4a495bd448

Change-Id: I2df8348654bd2a5e841d2c7bbefefb954dbd7867