Android Studio Support #2

Change-Id: I02b2cdfcb44c32a2971bdb4f3de99d00d195afab