Added changes related to adding infrastructure for android sdk integration for 5.0 sdk