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

Change-Id: Icbc3a7878d001ec62c15e9ef116bb1dc084c87ac