am a95a445f: am 8fbd4858: Merge "Remove tests for __LINE__ in nested multi-line macro...