Merge "vexpress: include-if-exists tablet-dalvik-heap.mk" into linaro-jb