Merge "Make hiddenapi gtest host-only"