Merge "Fixed android.uirendering package in CTS-5.0_R3" into lollipop-cts-dev