We need mercurial to fetch ics-openvpn.
Resources merge correctly.
No AIDL nor api, logfragment related xml files

api folder and aidl files aren't needed for us. They are used for
external apps that want to use ics-openvpn as an already installed
package, while what we want is to avoid the installation of ics-openvpn
including it (refactored) in bitmask android.