Merge "Allow version 52.0 class files"
am: b5b10204a5

Change-Id: I36bb237952309cdb764924dfe8d36a23c557ea91