Merge "Guard AConfiguration_getScreenRound."
am: f86192954b

Change-Id: I5f818195ab60b6ce3fb7a45d00c10feb5624ad09