Merge "Support for writing multiple maxTargetSdk APIs to one file."
am: 07d2c123a6

Change-Id: I372132f76c982b9213b8ea751843cb91f1ef018a