Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp * commit 'e5a6d16f26543061a0fc815ba90644a44995e025': Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp * commit 'e5a6d16f26543061a0fc815ba90644a44995e025': Fix http://b/2126318 (density test fails due to wrong-size asset stripping)