merge android_support in master

As request in https://github.com/Normation/rudder-techniques/pull/98 , here is the merge of android_support to the master branch.

Lot of fun fixing conflict :-)