Merge "Add support for @SystemApi annotation to aapt."