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

Change-Id: I6557159cd74ac9c3e5ae668a2946995ef6925633