Merge "DO NOT MERGE Add EffectBundleTest" into lollipop-mr1-cts-dev