Merge "ART: Refactor hidden_api"