Merge "display: Makefile changes for AOSP builds"