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

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