Android l-preview release 2
Merge "Remove reference of nonexistent resource dir."