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

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