Guard Android.mk and Prepend "vendor." to property#36

me-cafebabe wants to merge 2 commits intorobherring:masterrobherring/gbm_gralloc:masterfrom

me-cafebabe:masterme-cafebabe/gbm_gralloc:masterCopy head branch name to clipboard