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

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