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

* commit '7158f893b1c71386265248c981d723554724dab4':
  Allow number of supported Bitmap to be greater than 4.