Merge folder change from jb-dev

Was: Idfbb22d1206d325006d8fbd0d8ec1fd7e28e7908
At https://android-git.corp.google.com/g/#/c/184250

Change-Id: Ifefaded897271f964129bea26767c047b1a7bc15
1 file changed