Merge "Add TunnelInterface API and KernelResourceRecords" am: e02b700032
am: e1aa92f1c1

Change-Id: If27d78708ce225a900ad78a82d9f323770223808