Merge "Merge "Add tethering offload HAL call via JNI" am: 8f65e470b0 am: f421d60824 am: c967d56ad7  -s ours am: f11e70418c  -s ours"