Merge "Move HiddenApiTest from src to src/java"