Synchronize Android cookbook with upstream repo

Based on https://github.com/gildegoma/chef-android-sdk/commit/79b8bc13d799150c79d3fd31811a82568db5b068