Android R Preview 4 (RPP4.200409.015)
Makefile change to allow VTS testing
am: b9f27bbdad

Change-Id: I56b7be3edff63a0f0a095bc785a7093994391938