am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev

* commit 'b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c':
  Enable Picture w/ HW Accelerated Canvas.