update for android R

Change-Id: I8e7d60aa34739bf0365a62f95cd1fcf04576f132
6 files changed