Merge "Install runtime resource overlay without subdir." into cw-f-dev am: 84973f87e6
am: 6b06daa90e

Change-Id: I5efa04ba237dde5a361793d43ae26059bface3e0