Android R Preview 4 (RPP4.200409.015)
Merge "don't include liblog to APEXes"