Merge "Guard AConfiguration_getScreenRound." am: f86192954b am: a3e4e7fa14 am: fb8e17dc6a

Change-Id: Ia1d6b58a8153a5e88ec6604dcdbe4586bee89997