Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev
am: a3acf73c3e

Change-Id: I1aa48a41fbbf453f9a3d0ce794f81103a5ed1e35