Merge "Remove reference to support-v4-prebuilt" into oc-dev am: 04d2710c95
am: f63cc673cf

Change-Id: I8436636456a23ac38b577d5f0af179051960d3dc