Merge "Fix AVD memory leak" into oc-dev
am: 98db1264d4

Change-Id: If5b68f8f34691a5fdac3ec047048ad2c09b1761f