Merge "Android VPN sample for ICS SDK" into ics-mr0