Merge \"Merge \\"DO NOT MERGE: CTS test case for verifying overflow in libskia JPG processing\\" into lollipop-mr1-cts-dev am: 7cd0cf6c48  -s ours\" into marshmallow-cts-dev
am: 73711b9860  -s ours

Change-Id: Ide0f27ed10dc59abfc276302580dd3657804077f