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

* commit '9b8e6681df0ee6d33055efea5bf32a748cec68bf':
  Allow number of supported Bitmap to be greater than 4.