Android R Preview 4 (RPP4.200409.015)
Merge "silence -Wunreachable-code-loop-increment"