Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev