Merge "Move hidden APIs into system APIs"