Android CTS 6.0 Release 12 (3417974)
Merge "DO NOT MERGE: Only test up to 140 long file names." into marshmallow-cts-dev