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

Change-Id: I77acff2d773e0b419e2b7701e822a86be9480597